From 5c50675ccaf43bf3c0cfc56ee192af906a107ef1 Mon Sep 17 00:00:00 2001 From: Estevao Soares dos Santos Date: Sun, 26 Feb 2017 19:13:52 +0000 Subject: [PATCH] fix(simpleAutoLinks): URLs with emphasis/strikethrough are parsed correctly When a user enters a URL with emphasis or strikethrough, the html output were incorrect. Now, URLs inside emphasis or strikethrough are parsed corerctly Closes #347 --- dist/showdown.js | Bin 83750 -> 85143 bytes dist/showdown.js.map | Bin 243544 -> 247053 bytes dist/showdown.min.js | Bin 35012 -> 35657 bytes dist/showdown.min.js.map | Bin 37857 -> 38637 bytes src/subParsers/autoLinks.js | 108 +++++++----- src/subParsers/italicsAndBold.js | 31 +++- src/subParsers/spanGamut.js | 3 +- src/subParsers/strikethrough.js | 9 +- .../simplifiedAutoLink/blockquote.html | 3 + .../features/simplifiedAutoLink/blockquote.md | 1 + .../disallow-underscores.html} | 0 .../disallow-underscores.md} | 0 .../does-not-parse-inside-a-tags.html | 1 + .../does-not-parse-inside-a-tags.md | 1 + .../does-not-parse-inside-code.html | 6 + .../does-not-parse-inside-code.md | 5 + .../emphasis-and-strikethrough.html | 7 + .../emphasis-and-strikethrough.md | 13 ++ .../simplifiedAutoLink/ordered-lists.html | 11 ++ .../simplifiedAutoLink/ordered-lists.md | 11 ++ test/features/simplifiedAutoLink/text.html | 6 + test/features/simplifiedAutoLink/text.md | 13 ++ .../simplifiedAutoLink/unordered-lists.html | 11 ++ .../simplifiedAutoLink/unordered-lists.md | 11 ++ test/node/testsuite.features.js | 164 ++++++++++-------- 25 files changed, 289 insertions(+), 126 deletions(-) create mode 100644 test/features/simplifiedAutoLink/blockquote.html create mode 100644 test/features/simplifiedAutoLink/blockquote.md rename test/features/{autolink-and-disallow-underscores.html => simplifiedAutoLink/disallow-underscores.html} (100%) rename test/features/{autolink-and-disallow-underscores.md => simplifiedAutoLink/disallow-underscores.md} (100%) create mode 100644 test/features/simplifiedAutoLink/does-not-parse-inside-a-tags.html create mode 100644 test/features/simplifiedAutoLink/does-not-parse-inside-a-tags.md create mode 100644 test/features/simplifiedAutoLink/does-not-parse-inside-code.html create mode 100644 test/features/simplifiedAutoLink/does-not-parse-inside-code.md create mode 100644 test/features/simplifiedAutoLink/emphasis-and-strikethrough.html create mode 100644 test/features/simplifiedAutoLink/emphasis-and-strikethrough.md create mode 100644 test/features/simplifiedAutoLink/ordered-lists.html create mode 100644 test/features/simplifiedAutoLink/ordered-lists.md create mode 100644 test/features/simplifiedAutoLink/text.html create mode 100644 test/features/simplifiedAutoLink/text.md create mode 100644 test/features/simplifiedAutoLink/unordered-lists.html create mode 100644 test/features/simplifiedAutoLink/unordered-lists.md diff --git a/dist/showdown.js b/dist/showdown.js index dcdf75c4015e0ddbe045293f38a940185f37016e..c111e931fee5a351481b3cb72b5272969c7d008b 100644 GIT binary patch delta 1599 zcmbtUPfQe77|&~6v9z*m_+L=p2Hcrpmwkc?$|BoBlcp)AsYVX&5Ie8~J7IQaGc&lT ztdWb}Se$Qn#|E$V)|8eIZq11D|=Dd=$+z`vajI7M$v{yd zI~^h!AEYuJ_9W$mR`oV`mhpls>oc-F$PKfmIIk;4@uG5?#7U_bO$JKD7 zzZRwz4}g(%AGNR-IR(cQe%PuXHxZiLxhcc?J7|Un@x;V`+8$)jLPO36-MJo^$elDw z+^7cb=W4f9?S<#LR=0)SQWY|rG^tiXB%OnA?z-UWyc>w_0;E@cw6#|Z+?%g6qxFb} zjpY#Z8ewFkKDL`G3=4epb70dw#?o=LAD-%;8vh(emBy_QYVs7MjA^pj4)|-yq|w`9 zakUbrpbYw|YcTns3Lfje4>8tYWu~s?Erb+9Yv8@q&}cV$(xJ+itqvnIC|EzsPAcQ22uOZ5Muw#z2# z3_M-`3BL&_mIQZRPVYj?`3-UBTF!6yVBfz#9)6b=+=-KM!`q7pTzlc3`{Y$aO9>|p z#biZYIOa!QWVi$9pvSr*ozvtTl~H4vL5&NM02=?mxZaM+JO%c3j0KN$dM5^E3Jpwk pMR~EC%6r%}oE@-jZ2S>Kv*c~2*t#eSR%@LjCWKQ9Qv}_rc?}Gc9F+h7 delta 784 zcma)&OH30{6ozvNlsEw?kxOh$Rh86!D(>e)5k)V_o=HXVbDTEkB~Ebgn0R_uSK@xD3G0ik*-Z-`l}_mCaqvsE zgvXr{)o&(*mKxj3%q#@-!@p^uG diff --git a/dist/showdown.js.map b/dist/showdown.js.map index a915d0be32ca7679f377bf9170b6d32d35c1f09e..65a4772a8c68c707ab0dd4021e18e15af794cb2a 100644 GIT binary patch delta 3757 zcmbtX4NO$o70$hnVSe~|1I)-jK38;RWMl?$Wfw-^F${3BK{YlY9?0Ii+>WJEG zOTruG-gCb5opZi(UbyyU{DFOZ;9XK5%h(TfM=eCd#-=o^rk-abgZvy{nJD_oibT=w zE|;F7xl$A>LHiC#Wt;BBFzqiCAjFdbw&x2Cd=^I%mEKBol_*xRLuGmx>n6N(T^m~v zIyE~)(GhXQN39XXHEeub4-~Sm~>ZV?22)HgAP|Zf+LEW*Fy*9)8J_?Mi=z%$t=Q$!4WS1+21>WVp4Gs@Ufn zbgVQ}73-1n6V274SPgkY=s2JvIQ zM=Z+r3fWkKgAzUA=?=SOn=3I;K%5=zf+=JP3=LvwO4IP07ctJAQnP_03gUpy^;FL) zKGZSC5xh4lm~C<)v9R$C=~8-(4km(a2tfvXn3dN?qu7Weh6PtA!MQ4;V8*%x$S6ca z?QI@W6>O|XMGMNH|C=;h>R^1dR6uVTH2ssLvC^A5_Q`kwi@TB>N}(~CB!}}|3z+ZQ z$z-u|iz8HlM<)raFH=SH${}Hr6k~9mR7oieW;&Ohy^mRGXli828)!lKqwILLd0aQF zwUKB7wgzH^8z%_QKKV$)K32z(d}xXyi&$`PoZJ%aSd#$BDZN-nq^u;pB2MKhihM(=YQ}9*X+i zY9hkn7l;`dUfN4CnD?hCEU;gLztO{s)5yo?;I%5Mf!k%2XJ?!|v%bqSFXKV$C2BS~ zG$+&?DIM5kN3rkEM6uu0h0w1TQ8Se0k|<{Vql&$XeGgtiHQXm!7U<_$%{t^;#;&@v zA^x}I*KqE8Bnw8ISh+xk8V0^ilu^>Guzs5!v<}p$xd@eYa1`s;RY-J6(vZu0LLRBm z=*|n0VrZ;HRIc8i3_9s9kUE*9_y+U3JL61Eh+VfOs z>t!S}{VOE>**uy^+Tr^#Bn@JeScFGigu%`+b` zj2WqpS>M#K39MM-HL|1jaFPbBJ{-f~2a-;Uai35uMxcTuMVE(OJ9$aCewQKCfHdjW zF?@{uh3JNRa;crb_KjH4@PugcXgxG8L0OND;X`|tXpYUJs^Ls4J;RYaxSED<5!V}} zSKc2HvzP<}OKB`yZQ;N63~HcLj~n^({X7huA@LAMr}~g?q^8Sjm<8R7Lb$t^(y53! z!r}ip7GP)tRj@TR3g&j>TOvh8dn@78i}V870(Yx%lbk!H8{W5!4qYm+ScL8_x6tHv zclNkigy#09E}u}}w0M`(*|I5jPobq`etkpfyzGSrqiIo&xoG*~2B*jAf$NjB8*1*+ zT`d-iuVb6n?W%oc)hn(xS8u+sT(CHun~g?eyWj8imGrgxy{1B^6AvwYJv}{6XRc`` zLhj;*9Q+y?&*`jpIwNDk;60iHqxWbvq~E6jIB}n@GnyqL0{(QlyzZuE*QyTBR*c=+ z?P>ORbb171r&s#)!Rm`N4YY62DA>7&i%~r?0Mi3%h1v&Hfb9?H9C-Z!HNx8u=*wW- z$i+eO6yEBm=?joQO%0*5xI#_?9n-WhSBks4C=`G9lT50cI@}RV;I5TRhT4nxb~}~N zWy0t*)xx!DIyXzg*^IWEg}y$)V3V zAYp>)VekS?P#9&0hkcxIlyIqGzUre!ZmCu>57WgUFcibhf#OMe9InshbWr*gRY1a5 zRIh$iH52?~KbIz5q~n|Ry&{Bsb2*oN^gEngc8-y|-qG6OY7wDik~(0+X{_2b+JpZz zW?OxNTcDMc5whv_cVdGeVHvjwQm1GETz6sIvr{xad5QV)7XF98#a7NJS)^;jXC}Eo zyWwg&mm*z7!{4UpoW}_!KE^8)b1USirY6r0;WL)rL+E#3k zzFY7Qn`P$IV1h5(xCKzz%4Jmle*r?^Pv9PH<?Vfq~PYo~CvNb~$Pgr8-wwYc2HhOqWgrSic{f#Obb=kuPX&Zp>J X8bMQ$u-jAwmXq8|!?AYi<`)vq_Q+oUH zojrTb^FHtUyqELc=k1sOY>U3ZwpdW`D05&@HdFAFhyMd1KTDPGDR%tA!ut78J>L8& z%aOZJnPu8(1=AL`8sk=$pX{kGY1H*bwAk1q{E50bSfJW0{hJlMZ)1lntJWtFB^|on z0sSHF#LITp4^ubGMBr7H5C1`Cw{6z-%_ViZURSQ`HN9vvu_Aflc}3p1YR|soE>xR< zB^JajtRcx;t?S-u?D>GWv@6WS%5X4;=fe95v&-G3ikvQ@a2_?w+2#}(@tb6gFB4un zw`12jZjqmwt#W$ODm{5-%-We5zFd~g2WqA6$dQo`?1<8T^L%Je)JpIDZdvbe7uuYk_9g7}|5p1pOMzlaZ5I@#sSKQ4GGvXmH*;&)%fzQ1H$ag}(h2M%`Abz`u#I8n{XY zDV}6j-n$Mb(zzS4ZaSvADHxq(>k@YNZlWxl`ID0JfUZAa%)qcbaXpuM%z^J*WDh1V z-YsM?_IFysuTbaQa`2-7Q~8=&uw-LI{VHPVya;FBVrT9Q39W0$Nvz&1qbrp0X|9;+ zb-i9rHale`s1P>^mPRjKVdz5qy~H5U`sGN zMl&=^Ns3-$!(WjH_A7h0Q%>D9WzkCNLX{E_Tg)?(*UY_avTT79H(b=9vENZz0<`S= zE43I6rxM@4l2F0RI3x{n_hII^B+ zp=T}shO8>5EF15h@#4zJA64}E_=jlyD!K8zK#Qq~o*w6P9xhby1MJ~=eMjq4G|l4~ z9}#PtOP3cvwYI9jzqoLzYni*Kq`YEFFxV0d?rbS`2ZQaNt=mfG&{|zz+qPbTN_u?EO7SF}@b%RFJx_5*+hPH)6+CW#Nx2>bAVO!{NgoW_pkPvzJ zr4SjI5~2{yBvuJBf^HI<@I#X*!0<7VhPO>(P3~RD8c7XC6p@epipaIKYZY3%Hae=g zT$CQ1Q;29u5)m~di7M<$68GWR7NWeGB(e>18!X9UCEogsm*BW6su5c+QsZN(;&dl$ z{o+Zx%QrYQ5Dsmv^mX-B7M9^$zsSV1O;og9142R4fXK?cg()oad2Yg8?s7ccM71JV zp2an1?eh=`Vy_A(EQ6wb$t^?U+NBk1ee}5!sM|z1FerB9-GY7&Ht)(n6l3d<_^~75 z=yMQ*7rq^0;=lA|9Tq$Py)QzzacTH2zT!uBip3twW3^#D)X@_j7+mI#Upy?9GK_ge xa=hV)*voO`n20%DzRs>*%Bas{{8GA%R>7VW;lhn$!iv`mMPdBI<6>FXKLPo84wL`@ diff --git a/dist/showdown.min.js b/dist/showdown.min.js index e4073afa07416768a31a84a2a1a4a9f13c89f541..789dcb7e1d1e3431a83840a2f84e09e3e75cb70e 100644 GIT binary patch delta 987 zcmX>yk?G_#CVqV_MTO#w{PL9i@;n72vyJ>U)@;^giA4%Ilk05#8FMF}vyEWPo2+hU z$e2Gl(k_j$VDbSw2PU1u$&4COlQ)R5PhKC)$(S_xtaUh3qTb|KW~IpN__8JHBx&j-PQGAM&QxnXc|*1MwaEO&8cZb43FT4rjBL7!} zlJt;7OH1;7GV`+SH6~9imPApWXe-XBGuhGJP%jr^n-#*Y94z+dBiS#AVZ&s;K;_Lh z?Bz5kD>U$g>7?kSX;v4dmXsFdDPVJtnwmzUZK_^zX;MI9QE_UKh7yK}*~Lnl8o=NJ zdRbE^MLSVDZE|3=;^f>M{>iGDfmUgydC4W2`FS8EaH~>)A*5teTvC*umu_d1nro*7 zSs1W0t$r)Mh(kKd1?VWr) z%TpL4k7C1Qh3o+0ESQ+>jn{&S*&>rUa?G(=ve`e!o}ZCxa$og4l%%t-T5<9LBbLbq zHNSz;EfPVMC|0sbNzJiS0!B12%D~Lp$=bF4llz-_CwJ7!O5h6n$qyrCH=nPS(jp@ilCVqV_MTO#w{PL9i@;n72!;Snk){`B)_$I%#)0oVk#XH&2HjF7rZ*nZN z(&XK?nmlQxdC4W2`FRRy8i|ud?0nghbdoi7k|w9yl}}c5l$>m8FTrMAmRO{aK6#?G zKV!z^ht?5{nUk$-3>mW~=h&n%W>3Cs<1qQ6tB6>pPKu^ZqHUsHQEEX>VsffRwoaO+ z&g75wBJ65v8i}@0TQeQFl{0`!tq=;+(RF6&q)lGvATxQQz53>l4sx248@v=I`{(gb zUYHdqr({!HQk0*UZfBF4Yo}spqYtEP^r2!(lXbFHMd3<7(r}rkY!zN5Buz?_&u4om z!qtLgl(dtymC#MJ&T*H3tAeV48#*_~QvhrzLaWl`pE&_Un46pHjoaMIx!xG&ZZ^!b z=bx-o$3MBDwtw;gBbLebb-yQX5M!Ubw%&u0Yx386Ej}fil++w>uz={vfgv)JZ`AW` UPHN!iV$7Lb)HMl6vUa-w038>&wg3PC diff --git a/dist/showdown.min.js.map b/dist/showdown.min.js.map index 6c893618254a404fac1b4e66609174629bc80183..ca06c1476bd3a1b088e6964b34730739d3c32a3a 100644 GIT binary patch delta 4552 zcmbtXTWlNG5e1b8WH+`^_#w+r(SnlL+L%vCq+J)iyId}>))cj-DVjzLhmvKA6kigb zV(rqe#)+Leb|?7@P!}lBuc8V3RU|+CC{Q&0NPwbfixzE)0EN*ONWc4$&deoaSyq7p z{n_Q-duQg%%$d2vPk%h{&z}su_t_RWv2_kU+cNj?-qyEWTeGXRMOm)pFD^bDdEtxD zm=y6bjN@rqB{X zB(xMRPue6YGxUtNb^c&wvZa$i0dATv9h{14wh*?LUPeI|bS%M7yKKWRP4_^42L5h( zrlpXb2+J$0Q>W=@GAK!xhm0HRj8|i{o2fAdD{RuCFqsu{9HLS87F;4r9Sg3V+zB_L zqhpOYub?-i*I-8)mR8b*DCxNPSPJGtl0@>hwbB}#fg6sGa45$S>yxc%!)3Ixe^tiwrSEeGxn+5@N28<;MU$5;8JSExQR5Fd(MRBu9aAf;h)yMqZ_oUSUh1|o!!y!ZdAHCf*p+^xX~DPZ&17* zffQCaQiKP$yzueGXW>!fL^sI1SXSK$i`7Dc6^$@gsgt6Rohk80ihGGuo?%WCU(%RU zYt<;t5cSd&uXFeivVb*;ok}akgfUa%Qq1eU^2eIuE=Bc{i%uCHtm1$vI|&kT=Cy`_ z;-m-#UEK^t;yJ*;dHahEuJVk5zbk0o64kMIE(OBXXKxq$il-PJuhx zs-B0pT6_0(dhlz^bS*864tHtkho85?yZYPXxScb&DF6q}&>I z^~pf3cN^}mxl^0CWVSa4z%C_)oZ1`!(k)Kh^yx^O&T+F(;9exmf>Gm^#$-3AD^&PK zl$%|jbUn^+CE3E7(o4|lc;Q!_BLm4MeALIi@4^(i$gR4rQMZf?y{`8kvD-nYN$3d6R`Bl}Ts6FDrP#5lw*AKKRLIYoNc zpmy2o>cEdK-xv)tf8u58ABImM$Kas@nJPC7D+Ry4a(KUrKut9mzLJnHwvax<2RE;b z9q=nXd_VOk3+y9eA6JG4d^S`s?s<6dJHK&xE2>*~`0liGry0rP9JVlifhdk3G#KuD{ewZ2!N6wP z@Y~lfZ0EjW*_^>_8;m#pl5WJvmn>I1yC)=#9g9dp@vu2IZFqD$ zGv?^Q&GmXJyb?zdx`Nn@ zMU_`DSTKPd&%ptN14|}kk%Q0Wt)SSY82Onhljqobmia)ORmIUs6tYTmUzr7c8GiTX z5tj%4{pO)PHD+X5YsEw`b_u=onW7%Y33wQOzcK_Dz8C$5pDQfI&?prqW`{7emDV-J z-s>w(;v=HPtEEi+OW1{3Sh+U_TkpOwR^f6>cN{!}5S1W(qBgt#1t;&0>i^S8Wj;g6 zbm)&(76Tx$Az>I~2p-%$x^se^vzh3Ete7kC$Gg5w*GJwuHQ;d&>u8tb+<6k8g^k(~ zR#9J5M5>-f?~GY&*hnkogK;K5+xOm>@#+kOqsBOl`Smz#+_3SIB(ODBNlNfqPWs&( z&{Tjv4ZJd`OdGUjo#lwO9dO;>Q?>=)$p7!Y-2QX_a+~AkIu>96(@nX$ZD` z|HHsC1E}bAlRQaI5F@Z~DVK>AZZ(O}3|&iDA}qZ$!##F4xOeBLNqGYAFa)2b|K{S{ l3fM5Ry?qANSSgK$*mG;J21j>v&Y-+~wnjU`uEYD_{STfyA@cwL delta 3905 zcma)9U2GKB71ml1FiL^cEsOb!34(@r67R0PUbeKB?!7xZ9uMPTyo{G6ZILms_Ws%X zzuo{gke>n}*c{-g4~>M>ho)*Io?9uZ^3cAt=}TVvLn~CZ4}EB*s+B6WJ?G3Wh2ScE z@%o-~?)m-BId}g2gPz}gujj)@z3|m7)9|Qw`oZd!JAnt0=l^+RgC)!gY;hw)O)0dL z5UIM-3?XJFHC+hPp}%%X@t}5KX}za^>srl zN+F6eqBAoLhm2RYg-C^%4HHd2u>_}$9ozXJ9K01(bBT(AwQu&rLo0X?MQXZcVtj*a zGcUCxx=;nl5#p(y6bh#FL!rThh^U%G6>TLJ$H_(~z6yuq);WT6(|!Og_@vP{u*9^i zJdQ+jPPN#3wfdUwd_9RtXh{7rY(M*D-NT z3{MIbB?7E8Hf@|ouZBCPApES}ze_tO1X9T(Q^S8S+07(c)l2a6#tzus2<_C;h>?y& z1{3e|!wL9B-y5gSEurzAAJVDlNEjy0Zv#g+N9bR0D z1e!3lbR^J#8%r<0Qe^flUZ^JuguumwIYDluhq)`=oYXQxRb&=^y|i;ztK)tZ%TW0c;nL-WA=H$Be^XPJZJ(u<2^)*t~5G2^HO-@c{6m$*Jc*A7sWDw&`=u~ZG zl`t7WWOXz3WZ3YlH}-q$#H6>@_kd$c2{X372UtX#;2M^QqzkVF3UK+tzC%UoU6o8w z4Z3japao0oV(E>T%)`eQLV*hOU);U9dYnX4H97?95WP5X)Ssm(q}SycL_|fJbso7^ z%LmAaPB_Z)a)?W6C6Do!ioxo|{Wh{O7daW8ATbwlp-&I80*?tz1{F0PH49pwmr;M~ zEE+`QMPN)5Ox+Rq*TruHV(|KFOQ? zKN_(MG$d4*ycQTx3{YYF5fGUWJlnIx1~7^mdA zCeA03$x@Y#s2ru`s(Uqf{msVKDh~*Mfuw8j+cytGG>CSmSF!ohgc><+9 zC(+P^$dNP zTD>MKtnld-&w&cF1RuUVv8l)#HisMb@33-o1I$=E;hl*f41W6#9JtmGTdw`P*QF&q zX+}-BbbYMnsDK||A9xPes46AkxVIa&pAEw3jr*IAFu*en`2CI3Tg#L)!{QM((*Wn) zhk+`DZU)aH0H_{VODcgjf_ij%Nrppiad&U2feaY^Z6jzs0@XfWO_$d@IC-wtQUBZnA5vF@@PS zVu~#-vDysN?FkB^?RN`T!7I6hmB+&oi#1dATdNHpytgy31RuZWF6UhIM?b}eXu}GF z-89QCS@kNUL`CHS4HjYhJH9|f69Hq1r08%cMS5b9Z9b`|$P^o|(2Qp@hK3tEr}!e= zz4gLaj-P+rQoeO7KhD+}?kXMDmIjB{qT=U5b~?Zfe>TZV{a&b_z0vsX2aLogiluYot*Q5{zN*O97Y?#Sa2m0R5t7;6U({(q9U*7gKO;e)lqeZw3S&o68r zRHrY%AJ@X`(zV-PUyeUhgLRyrBEa_#BCrTK_;Emuj-wM#6d59HDtjCQ z#HE3p$&jQfnVb^#Qk~K4W$gTpn-+2`d`yv0m35L9dcKC(M=wk#HK$0WQze>lf*i9j z&uH^W97P`AcwB&j8fBuhNRA3?kl%p48T^jI%ib_7!d`geb{~8fzH|&b4T(;S>r?68 z#3R)QJ=D+US;B4mQ^Eg$nmI?e(rp$qJLY1y@9c#!cy2j0{9iZ-LbblAC|K&hL}HLl zSy8`}NlypdgZ%za@TKE+&y7H34HqHLW2k5BNZ8exTI?bsMc?SIjv zXUV`5q7;@tM4T`+lO9)Dzl*|tfK_;SXJ1dj=5M#}RChx7?)~0*Hnkut@SD54wvSHI zh{wgo@0cN9^bg~~7foT}ey6f#Y3>LIHv{^X=C|s}1xVi;*xHyvj|@+vx8TVpymjyJ Uw$>DCvQCtVgI{FuqkEzM0CJ^r@c;k- diff --git a/src/subParsers/autoLinks.js b/src/subParsers/autoLinks.js index 1e08785..cc03aca 100644 --- a/src/subParsers/autoLinks.js +++ b/src/subParsers/autoLinks.js @@ -1,54 +1,74 @@ +// url allowed chars [a-z\d_.~:/?#[]@!$&'()*+,;=-] + +var simpleURLRegex = /\b(((https?|ftp|dict):\/\/|www\.)[^'">\s]+\.[^'">\s]+)()(?=\s|$)(?!["<>])/gi, + simpleURLRegex2 = /\b(((https?|ftp|dict):\/\/|www\.)[^'">\s]+\.[^'">\s]+?)([.!?()]?)(?=\s|$)(?!["<>])/gi, + //simpleURLRegex3 = /\b(((https?|ftp):\/\/|www\.)[a-z\d.-]+\.[a-z\d_.~:/?#\[\]@!$&'()*+,;=-]+?)([.!?()]?)(?=\s|$)(?!["<>])/gi, + delimUrlRegex = /<(((https?|ftp|dict):\/\/|www\.)[^'">\s]+)>/gi, + simpleMailRegex = /(^|\s)(?:mailto:)?([A-Za-z0-9!#$%&'*+-/=?^_`{|}~.]+@[-a-z0-9]+(\.[-a-z0-9]+)*\.[a-z]+)(?=$|\s)/gmi, + delimMailRegex = /<()(?:mailto:)?([-.\w]+@[-a-z0-9]+(\.[-a-z0-9]+)*\.[a-z]+)>/gi, + + replaceLink = function (options) { + 'use strict'; + + return function (wm, link, m2, m3, trailingPunctuation) { + var lnkTxt = link, + append = ''; + if (/^www\./i.test(link)) { + link = link.replace(/^www\./i, 'http://www.'); + } + if (options.excludeTrailingPunctuationFromURLs && trailingPunctuation) { + append = trailingPunctuation; + } + return '' + lnkTxt + '' + append; + }; + }, + + replaceMail = function (options, globals) { + 'use strict'; + return function (wholeMatch, b, mail) { + var href = 'mailto:'; + b = b || ''; + mail = showdown.subParser('unescapeSpecialChars')(mail, options, globals); + if (options.encodeEmails) { + href = showdown.helper.encodeEmailAddress(href + mail); + mail = showdown.helper.encodeEmailAddress(mail); + } else { + href = href + mail; + } + return b + '' + mail + ''; + }; + }; + showdown.subParser('autoLinks', function (text, options, globals) { 'use strict'; text = globals.converter._dispatch('autoLinks.before', text, options, globals); - var simpleURLRegex = /\b(((https?|ftp|dict):\/\/|www\.)[^'">\s]+\.[^'">\s]+)()(?=\s|$)(?!["<>])/gi, - simpleURLRegex2 = /\b(((https?|ftp|dict):\/\/|www\.)[^'">\s]+\.[^'">\s]+?)([.!?()]?)(?=\s|$)(?!["<>])/gi, - delimUrlRegex = /<(((https?|ftp|dict):\/\/|www\.)[^'">\s]+)>/gi, - simpleMailRegex = /(^|\s)(?:mailto:)?([A-Za-z0-9!#$%&'*+-/=?^_`{|}~.]+@[-a-z0-9]+(\.[-a-z0-9]+)*\.[a-z]+)(?=$|\s)/gmi, - delimMailRegex = /<()(?:mailto:)?([-.\w]+@[-a-z0-9]+(\.[-a-z0-9]+)*\.[a-z]+)>/gi; - - text = text.replace(delimUrlRegex, replaceLink); - text = text.replace(delimMailRegex, replaceMail); - // simpleURLRegex = /\b(((https?|ftp|dict):\/\/|www\.)[-.+~:?#@!$&'()*,;=[\]\w]+)\b/gi, - // Email addresses: - - if (options.simplifiedAutoLink) { - if (options.excludeTrailingPunctuationFromURLs) { - text = text.replace(simpleURLRegex2, replaceLink); - } else { - text = text.replace(simpleURLRegex, replaceLink); - } - text = text.replace(simpleMailRegex, replaceMail); - } - - function replaceLink (wm, link, m2, m3, trailingPunctuation) { - var lnkTxt = link, - append = ''; - if (/^www\./i.test(link)) { - link = link.replace(/^www\./i, 'http://www.'); - } - if (options.excludeTrailingPunctuationFromURLs && trailingPunctuation) { - append = trailingPunctuation; - } - return '' + lnkTxt + '' + append; - } - - function replaceMail (wholeMatch, b, mail) { - var href = 'mailto:'; - b = b || ''; - mail = showdown.subParser('unescapeSpecialChars')(mail, options, globals); - if (options.encodeEmails) { - href = showdown.helper.encodeEmailAddress(href + mail); - mail = showdown.helper.encodeEmailAddress(mail); - } else { - href = href + mail; - } - return b + '' + mail + ''; - } + text = text.replace(delimUrlRegex, replaceLink(options)); + text = text.replace(delimMailRegex, replaceMail(options, globals)); text = globals.converter._dispatch('autoLinks.after', text, options, globals); return text; }); + +showdown.subParser('simplifiedAutoLinks', function (text, options, globals) { + 'use strict'; + + if (!options.simplifiedAutoLink) { + return text; + } + + text = globals.converter._dispatch('simplifiedAutoLinks.before', text, options, globals); + + if (options.excludeTrailingPunctuationFromURLs) { + text = text.replace(simpleURLRegex2, replaceLink(options)); + } else { + text = text.replace(simpleURLRegex, replaceLink(options)); + } + text = text.replace(simpleMailRegex, replaceMail(options, globals)); + + text = globals.converter._dispatch('simplifiedAutoLinks.after', text, options, globals); + + return text; +}); diff --git a/src/subParsers/italicsAndBold.js b/src/subParsers/italicsAndBold.js index 9616136..9fd80c1 100644 --- a/src/subParsers/italicsAndBold.js +++ b/src/subParsers/italicsAndBold.js @@ -7,34 +7,47 @@ showdown.subParser('italicsAndBold', function (text, options, globals) { // because of backtracing, in some cases, it could lead to an exponential effect // called "catastrophic backtrace". Ominous! + function parseInside (txt, left, right) { + if (options.simplifiedAutoLink) { + txt = showdown.subParser('simplifiedAutoLinks')(txt, options, globals); + } + return left + txt + right; + } + // Parse underscores if (options.literalMidWordUnderscores) { - text = text.replace(/\b___(\S[\s\S]*)___\b/g, '$1'); - text = text.replace(/\b__(\S[\s\S]*)__\b/g, '$1'); - text = text.replace(/\b_(\S[\s\S]*?)_\b/g, '$1'); + text = text.replace(/\b___(\S[\s\S]*)___\b/g, function (wm, txt) { + return parseInside (txt, '', ''); + }); + text = text.replace(/\b__(\S[\s\S]*)__\b/g, function (wm, txt) { + return parseInside (txt, '', ''); + }); + text = text.replace(/\b_(\S[\s\S]*?)_\b/g, function (wm, txt) { + return parseInside (txt, '', ''); + }); } else { text = text.replace(/___(\S[\s\S]*?)___/g, function (wm, m) { - return (/\S$/.test(m)) ? '' + m + '' : wm; + return (/\S$/.test(m)) ? parseInside (m, '', '') : wm; }); text = text.replace(/__(\S[\s\S]*?)__/g, function (wm, m) { - return (/\S$/.test(m)) ? '' + m + '' : wm; + return (/\S$/.test(m)) ? parseInside (m, '', '') : wm; }); text = text.replace(/_([^\s_][\s\S]*?)_/g, function (wm, m) { // !/^_[^_]/.test(m) - test if it doesn't start with __ (since it seems redundant, we removed it) - return (/\S$/.test(m)) ? '' + m + '' : wm; + return (/\S$/.test(m)) ? parseInside (m, '', '') : wm; }); } // Now parse asterisks text = text.replace(/\*\*\*(\S[\s\S]*?)\*\*\*/g, function (wm, m) { - return (/\S$/.test(m)) ? '' + m + '' : wm; + return (/\S$/.test(m)) ? parseInside (m, '', '') : wm; }); text = text.replace(/\*\*(\S[\s\S]*?)\*\*/g, function (wm, m) { - return (/\S$/.test(m)) ? '' + m + '' : wm; + return (/\S$/.test(m)) ? parseInside (m, '', '') : wm; }); text = text.replace(/\*([^\s*][\s\S]*?)\*/g, function (wm, m) { // !/^\*[^*]/.test(m) - test if it doesn't start with ** (since it seems redundant, we removed it) - return (/\S$/.test(m)) ? '' + m + '' : wm; + return (/\S$/.test(m)) ? parseInside (m, '', '') : wm; }); text = globals.converter._dispatch('italicsAndBold.after', text, options, globals); diff --git a/src/subParsers/spanGamut.js b/src/subParsers/spanGamut.js index d693882..b829ba4 100644 --- a/src/subParsers/spanGamut.js +++ b/src/subParsers/spanGamut.js @@ -16,11 +16,12 @@ showdown.subParser('spanGamut', function (text, options, globals) { text = showdown.subParser('anchors')(text, options, globals); // Make links out of things like `` - // Must come after _DoAnchors(), because you can use < and > + // Must come after anchors, because you can use < and > // delimiters in inline links like [this](). text = showdown.subParser('autoLinks')(text, options, globals); text = showdown.subParser('italicsAndBold')(text, options, globals); text = showdown.subParser('strikethrough')(text, options, globals); + text = showdown.subParser('simplifiedAutoLinks')(text, options, globals); // we need to hash HTML tags inside spans text = showdown.subParser('hashHTMLSpans')(text, options, globals); diff --git a/src/subParsers/strikethrough.js b/src/subParsers/strikethrough.js index e7c8757..4517c67 100644 --- a/src/subParsers/strikethrough.js +++ b/src/subParsers/strikethrough.js @@ -1,9 +1,16 @@ showdown.subParser('strikethrough', function (text, options, globals) { 'use strict'; + function parseInside (txt) { + if (options.simplifiedAutoLink) { + txt = showdown.subParser('simplifiedAutoLinks')(txt, options, globals); + } + return '' + txt + ''; + } + if (options.strikethrough) { text = globals.converter._dispatch('strikethrough.before', text, options, globals); - text = text.replace(/(?:~){2}([\s\S]+?)(?:~){2}/g, '$1'); + text = text.replace(/(?:~){2}([\s\S]+?)(?:~){2}/g, function (wm, txt) { return parseInside(txt); }); text = globals.converter._dispatch('strikethrough.after', text, options, globals); } diff --git a/test/features/simplifiedAutoLink/blockquote.html b/test/features/simplifiedAutoLink/blockquote.html new file mode 100644 index 0000000..f2e95e1 --- /dev/null +++ b/test/features/simplifiedAutoLink/blockquote.html @@ -0,0 +1,3 @@ +
+

http://www.google.com

+
diff --git a/test/features/simplifiedAutoLink/blockquote.md b/test/features/simplifiedAutoLink/blockquote.md new file mode 100644 index 0000000..cde3848 --- /dev/null +++ b/test/features/simplifiedAutoLink/blockquote.md @@ -0,0 +1 @@ +> http://www.google.com diff --git a/test/features/autolink-and-disallow-underscores.html b/test/features/simplifiedAutoLink/disallow-underscores.html similarity index 100% rename from test/features/autolink-and-disallow-underscores.html rename to test/features/simplifiedAutoLink/disallow-underscores.html diff --git a/test/features/autolink-and-disallow-underscores.md b/test/features/simplifiedAutoLink/disallow-underscores.md similarity index 100% rename from test/features/autolink-and-disallow-underscores.md rename to test/features/simplifiedAutoLink/disallow-underscores.md diff --git a/test/features/simplifiedAutoLink/does-not-parse-inside-a-tags.html b/test/features/simplifiedAutoLink/does-not-parse-inside-a-tags.html new file mode 100644 index 0000000..044e97b --- /dev/null +++ b/test/features/simplifiedAutoLink/does-not-parse-inside-a-tags.html @@ -0,0 +1 @@ +

www.google.com

diff --git a/test/features/simplifiedAutoLink/does-not-parse-inside-a-tags.md b/test/features/simplifiedAutoLink/does-not-parse-inside-a-tags.md new file mode 100644 index 0000000..51a9890 --- /dev/null +++ b/test/features/simplifiedAutoLink/does-not-parse-inside-a-tags.md @@ -0,0 +1 @@ +www.google.com diff --git a/test/features/simplifiedAutoLink/does-not-parse-inside-code.html b/test/features/simplifiedAutoLink/does-not-parse-inside-code.html new file mode 100644 index 0000000..5a99028 --- /dev/null +++ b/test/features/simplifiedAutoLink/does-not-parse-inside-code.html @@ -0,0 +1,6 @@ +
some code with
+a link
+www.google.com
+
+and another link http://www.google.com
+
diff --git a/test/features/simplifiedAutoLink/does-not-parse-inside-code.md b/test/features/simplifiedAutoLink/does-not-parse-inside-code.md new file mode 100644 index 0000000..c4c8694 --- /dev/null +++ b/test/features/simplifiedAutoLink/does-not-parse-inside-code.md @@ -0,0 +1,5 @@ + some code with + a link + www.google.com + + and another link http://www.google.com diff --git a/test/features/simplifiedAutoLink/emphasis-and-strikethrough.html b/test/features/simplifiedAutoLink/emphasis-and-strikethrough.html new file mode 100644 index 0000000..c3da7fd --- /dev/null +++ b/test/features/simplifiedAutoLink/emphasis-and-strikethrough.html @@ -0,0 +1,7 @@ +

http://www.google.com/foobar

+

http://www.google.com/foobar

+

http://www.google.com/foobar

+

http://www.google.com/foobar

+

http://www.google.com/foobar

+

http://www.google.com/foobar

+

http://www.google.com/foobar

diff --git a/test/features/simplifiedAutoLink/emphasis-and-strikethrough.md b/test/features/simplifiedAutoLink/emphasis-and-strikethrough.md new file mode 100644 index 0000000..25814b4 --- /dev/null +++ b/test/features/simplifiedAutoLink/emphasis-and-strikethrough.md @@ -0,0 +1,13 @@ +*http://www.google.com/foobar* + +**http://www.google.com/foobar** + +***http://www.google.com/foobar*** + +~~http://www.google.com/foobar~~ + +_http://www.google.com/foobar_ + +__http://www.google.com/foobar__ + +___http://www.google.com/foobar___ \ No newline at end of file diff --git a/test/features/simplifiedAutoLink/ordered-lists.html b/test/features/simplifiedAutoLink/ordered-lists.html new file mode 100644 index 0000000..cbb2217 --- /dev/null +++ b/test/features/simplifiedAutoLink/ordered-lists.html @@ -0,0 +1,11 @@ +
    +
  1. http://www.google.com/listitem1
    2. +
  2. http://www.google.com/listitem2
    3. +
  3. http://www.google.com/listitem3
    4. +
+

foo

+
    +

  1. http://www.google.com/listitem1

    2. +

  2. http://www.google.com/listitem2

    3. +

  3. http://www.google.com/listitem3

    4. +
diff --git a/test/features/simplifiedAutoLink/ordered-lists.md b/test/features/simplifiedAutoLink/ordered-lists.md new file mode 100644 index 0000000..df50da9 --- /dev/null +++ b/test/features/simplifiedAutoLink/ordered-lists.md @@ -0,0 +1,11 @@ +1. http://www.google.com/listitem1 +2. http://www.google.com/listitem2 +3. http://www.google.com/listitem3 + +foo + +1. http://www.google.com/listitem1 + +2. http://www.google.com/listitem2 + +3. http://www.google.com/listitem3 \ No newline at end of file diff --git a/test/features/simplifiedAutoLink/text.html b/test/features/simplifiedAutoLink/text.html new file mode 100644 index 0000000..5f7d35c --- /dev/null +++ b/test/features/simplifiedAutoLink/text.html @@ -0,0 +1,6 @@ +

http://www.google.com/foobar

+

www.google.com/foobar

+

ftp://user:password@host.com:port/path

+

this has some http://www.google.com/foobar in text

+

this has some www.google.com/foobar in text

+

this has some ftp://user:password@host.com:port/path in text

diff --git a/test/features/simplifiedAutoLink/text.md b/test/features/simplifiedAutoLink/text.md new file mode 100644 index 0000000..9c65067 --- /dev/null +++ b/test/features/simplifiedAutoLink/text.md @@ -0,0 +1,13 @@ +http://www.google.com/foobar + +www.google.com/foobar + +ftp://user:password@host.com:port/path + +this has some http://www.google.com/foobar in text + +this has some www.google.com/foobar in text + +this has some ftp://user:password@host.com:port/path in text + + diff --git a/test/features/simplifiedAutoLink/unordered-lists.html b/test/features/simplifiedAutoLink/unordered-lists.html new file mode 100644 index 0000000..bc728f6 --- /dev/null +++ b/test/features/simplifiedAutoLink/unordered-lists.html @@ -0,0 +1,11 @@ + +

a

+ diff --git a/test/features/simplifiedAutoLink/unordered-lists.md b/test/features/simplifiedAutoLink/unordered-lists.md new file mode 100644 index 0000000..0d7e6f4 --- /dev/null +++ b/test/features/simplifiedAutoLink/unordered-lists.md @@ -0,0 +1,11 @@ + - http://www.google.com/foo + - http://www.google.com/bar + - http://www.google.com/baz + +a + + - http://www.google.com/foo + + - http://www.google.com/bar + + - http://www.google.com/baz diff --git a/test/node/testsuite.features.js b/test/node/testsuite.features.js index 46946da..0982447 100644 --- a/test/node/testsuite.features.js +++ b/test/node/testsuite.features.js @@ -5,87 +5,109 @@ var bootstrap = require('../bootstrap.js'), showdown = bootstrap.showdown, assertion = bootstrap.assertion, testsuite = bootstrap.getTestSuite('test/features/'), - tableSuite = bootstrap.getTestSuite('test/features/tables/'); + tableSuite = bootstrap.getTestSuite('test/features/tables/'), + simplifiedAutoLinkSuite = bootstrap.getTestSuite('test/features/simplifiedAutoLink/'); describe('makeHtml() features testsuite', function () { 'use strict'; - for (var i = 0; i < testsuite.length; ++i) { - var converter; - if (testsuite[i].name === '#143.support-image-dimensions') { - converter = new showdown.Converter({parseImgDimensions: true}); - } else if (testsuite[i].name === '#69.header-level-start') { - converter = new showdown.Converter({headerLevelStart: 3}); - } else if (testsuite[i].name === '#164.1.simple-autolink' || testsuite[i].name === '#204.certain-links-with-at-and-dot-break-url') { - converter = new showdown.Converter({simplifiedAutoLink: true}); - } else if (testsuite[i].name === '#164.2.disallow-underscore-emphasis-mid-word') { - converter = new showdown.Converter({literalMidWordUnderscores: true}); - } else if (testsuite[i].name === '#164.3.strikethrough' || testsuite[i].name === '#214.escaped-markdown-chars-break-strikethrough') { - converter = new showdown.Converter({strikethrough: true}); - } else if (testsuite[i].name === 'disable-gh-codeblocks') { - converter = new showdown.Converter({ghCodeBlocks: false}); - } else if (testsuite[i].name === '#164.4.tasklists') { - converter = new showdown.Converter({tasklists: true}); - } else if (testsuite[i].name === 'autolink-and-disallow-underscores') { - converter = new showdown.Converter({literalMidWordUnderscores: true, simplifiedAutoLink: true}); - } else if (testsuite[i].name === '#198.literalMidWordUnderscores-changes-behavior-of-asterisk') { - converter = new showdown.Converter({literalMidWordUnderscores: true}); - } else if (testsuite[i].name === '#259.es6-template-strings-indentation-issues') { - converter = new showdown.Converter({smartIndentationFix: true}); - } else if (testsuite[i].name === '#284.simplifiedAutoLink-does-not-match-GFM-style') { - converter = new showdown.Converter({simplifiedAutoLink: true}); - } else if (testsuite[i].name === 'disableForced4SpacesIndentedSublists') { - converter = new showdown.Converter({disableForced4SpacesIndentedSublists: true}); - } else if (testsuite[i].name === '#206.treat-single-line-breaks-as-br') { - converter = new showdown.Converter({simpleLineBreaks: true}); - } else if (testsuite[i].name === 'simpleLineBreaks2') { - converter = new showdown.Converter({simpleLineBreaks: true}); - } else if (testsuite[i].name === '#316.new-simpleLineBreaks-option-breaks-lists') { - converter = new showdown.Converter({simpleLineBreaks: true}); - } else if (testsuite[i].name === '#323.simpleLineBreaks-breaks-with-strong') { - converter = new showdown.Converter({simpleLineBreaks: true}); - } else if (testsuite[i].name === '#318.simpleLineBreaks-does-not-work-with-chinese-characters') { - converter = new showdown.Converter({simpleLineBreaks: true}); - } else if (testsuite[i].name === 'simpleLineBreaks-handle-html-pre') { - converter = new showdown.Converter({simpleLineBreaks: true}); - } else if (testsuite[i].name === 'excludeTrailingPunctuationFromURLs-option') { - converter = new showdown.Converter({simplifiedAutoLink: true, excludeTrailingPunctuationFromURLs: true}); - } else if (testsuite[i].name === 'requireSpaceBeforeHeadingText') { - converter = new showdown.Converter({requireSpaceBeforeHeadingText: true}); - } else if (testsuite[i].name === '#320.github-compatible-generated-header-id') { - converter = new showdown.Converter({ghCompatibleHeaderId: true}); - } else if (testsuite[i].name === 'ghMentions') { - converter = new showdown.Converter({ghMentions: true}); - } else if (testsuite[i].name === 'disable-email-encoding') { - converter = new showdown.Converter({encodeEmails: false}); - } else if (testsuite[i].name === '#330.simplifiedAutoLink-drops-character-before-and-after-linked-mail') { - converter = new showdown.Converter({encodeEmails: false, simplifiedAutoLink: true}); - } else if (testsuite[i].name === '#331.allow-escaping-of-tilde') { - converter = new showdown.Converter({strikethrough: true}); - } else if (testsuite[i].name === 'prefixHeaderId-simple') { - converter = new showdown.Converter({prefixHeaderId: true}); - } else if (testsuite[i].name === 'prefixHeaderId-string') { - converter = new showdown.Converter({prefixHeaderId: 'my-prefix-'}); - } else if (testsuite[i].name === 'prefixHeaderId-string-and-ghCompatibleHeaderId') { - converter = new showdown.Converter({prefixHeaderId: 'my-prefix-', ghCompatibleHeaderId: true}); - } else if (testsuite[i].name === 'prefixHeaderId-string-and-ghCompatibleHeaderId2') { - converter = new showdown.Converter({prefixHeaderId: 'my prefix ', ghCompatibleHeaderId: true}); - } else { - converter = new showdown.Converter(); - } - it(testsuite[i].name.replace(/-/g, ' '), assertion(testsuite[i], converter)); - } + describe('issues', function () { + for (var i = 0; i < testsuite.length; ++i) { + var converter; + if (testsuite[i].name === '#143.support-image-dimensions') { + converter = new showdown.Converter({parseImgDimensions: true}); + } else if (testsuite[i].name === '#69.header-level-start') { + converter = new showdown.Converter({headerLevelStart: 3}); + } else if (testsuite[i].name === '#164.1.simple-autolink' || testsuite[i].name === '#204.certain-links-with-at-and-dot-break-url') { + converter = new showdown.Converter({simplifiedAutoLink: true}); + } else if (testsuite[i].name === '#164.2.disallow-underscore-emphasis-mid-word') { + converter = new showdown.Converter({literalMidWordUnderscores: true}); + } else if (testsuite[i].name === '#164.3.strikethrough' || testsuite[i].name === '#214.escaped-markdown-chars-break-strikethrough') { + converter = new showdown.Converter({strikethrough: true}); + } else if (testsuite[i].name === 'disable-gh-codeblocks') { + converter = new showdown.Converter({ghCodeBlocks: false}); + } else if (testsuite[i].name === '#164.4.tasklists') { + converter = new showdown.Converter({tasklists: true}); + } else if (testsuite[i].name === '#198.literalMidWordUnderscores-changes-behavior-of-asterisk') { + converter = new showdown.Converter({literalMidWordUnderscores: true}); + } else if (testsuite[i].name === '#259.es6-template-strings-indentation-issues') { + converter = new showdown.Converter({smartIndentationFix: true}); + } else if (testsuite[i].name === '#284.simplifiedAutoLink-does-not-match-GFM-style') { + converter = new showdown.Converter({simplifiedAutoLink: true}); + } else if (testsuite[i].name === 'disableForced4SpacesIndentedSublists') { + converter = new showdown.Converter({disableForced4SpacesIndentedSublists: true}); + } else if (testsuite[i].name === '#206.treat-single-line-breaks-as-br') { + converter = new showdown.Converter({simpleLineBreaks: true}); + } else if (testsuite[i].name === 'simpleLineBreaks2') { + converter = new showdown.Converter({simpleLineBreaks: true}); + } else if (testsuite[i].name === '#316.new-simpleLineBreaks-option-breaks-lists') { + converter = new showdown.Converter({simpleLineBreaks: true}); + } else if (testsuite[i].name === '#323.simpleLineBreaks-breaks-with-strong') { + converter = new showdown.Converter({simpleLineBreaks: true}); + } else if (testsuite[i].name === '#318.simpleLineBreaks-does-not-work-with-chinese-characters') { + converter = new showdown.Converter({simpleLineBreaks: true}); + } else if (testsuite[i].name === 'simpleLineBreaks-handle-html-pre') { + converter = new showdown.Converter({simpleLineBreaks: true}); + } else if (testsuite[i].name === 'excludeTrailingPunctuationFromURLs-option') { + converter = new showdown.Converter({simplifiedAutoLink: true, excludeTrailingPunctuationFromURLs: true}); + } else if (testsuite[i].name === 'requireSpaceBeforeHeadingText') { + converter = new showdown.Converter({requireSpaceBeforeHeadingText: true}); + } else if (testsuite[i].name === '#320.github-compatible-generated-header-id') { + converter = new showdown.Converter({ghCompatibleHeaderId: true}); + } else if (testsuite[i].name === 'ghMentions') { + converter = new showdown.Converter({ghMentions: true}); + } else if (testsuite[i].name === 'disable-email-encoding') { + converter = new showdown.Converter({encodeEmails: false}); + } else if (testsuite[i].name === '#330.simplifiedAutoLink-drops-character-before-and-after-linked-mail') { + converter = new showdown.Converter({encodeEmails: false, simplifiedAutoLink: true}); + } else if (testsuite[i].name === '#331.allow-escaping-of-tilde') { + converter = new showdown.Converter({strikethrough: true}); + } else if (testsuite[i].name === 'prefixHeaderId-simple') { + converter = new showdown.Converter({prefixHeaderId: true}); + } else if (testsuite[i].name === 'prefixHeaderId-string') { + converter = new showdown.Converter({prefixHeaderId: 'my-prefix-'}); + } else if (testsuite[i].name === 'prefixHeaderId-string-and-ghCompatibleHeaderId') { + converter = new showdown.Converter({prefixHeaderId: 'my-prefix-', ghCompatibleHeaderId: true}); + } else if (testsuite[i].name === 'prefixHeaderId-string-and-ghCompatibleHeaderId2') { + converter = new showdown.Converter({prefixHeaderId: 'my prefix ', ghCompatibleHeaderId: true}); + } else if (testsuite[i].name === 'simplifiedAutoLink') { + converter = new showdown.Converter({simplifiedAutoLink: true, strikethrough: true}); + } else { + converter = new showdown.Converter(); + } + it(testsuite[i].name.replace(/-/g, ' '), assertion(testsuite[i], converter)); + } + }); + + // test Table Syntax Support describe('table support', function () { - var converter; - for (var i = 0; i < tableSuite.length; ++i) { - if (tableSuite[i].name === 'basic-with-header-ids') { + var converter, + suite = tableSuite; + for (var i = 0; i < suite.length; ++i) { + if (suite[i].name === 'basic-with-header-ids') { converter = new showdown.Converter({tables: true, tableHeaderId: true}); - } else if (tableSuite[i].name === '#179.parse-md-in-table-ths') { + } else if (suite[i].name === '#179.parse-md-in-table-ths') { converter = new showdown.Converter({tables: true, strikethrough: true}); } else { converter = new showdown.Converter({tables: true}); } - it(tableSuite[i].name.replace(/-/g, ' '), assertion(tableSuite[i], converter)); + it(suite[i].name.replace(/-/g, ' '), assertion(suite[i], converter)); + } + }); + + // test simplifiedAutoLink Support + describe('simplifiedAutoLink support in', function () { + var converter, + suite = simplifiedAutoLinkSuite; + for (var i = 0; i < suite.length; ++i) { + if (suite[i].name === 'emphasis-and-strikethrough') { + converter = new showdown.Converter({simplifiedAutoLink: true, strikethrough: true}); + } else if (suite[i].name === 'disallow-underscores') { + converter = new showdown.Converter({literalMidWordUnderscores: true, simplifiedAutoLink: true}); + } else { + converter = new showdown.Converter({simplifiedAutoLink: true}); + } + it(suite[i].name.replace(/-/g, ' '), assertion(suite[i], converter)); } });