From 5a5aff6721048f9273eeb1b4e734e9745252356e Mon Sep 17 00:00:00 2001 From: Estevao Soares dos Santos Date: Fri, 2 Jun 2017 04:48:53 +0100 Subject: [PATCH 1/7] feat(backslashEscapesHTMLTags): backslash escapes HTML tags Add support for HTML tag escaping with backslash Closes #374 --- README.md | 6 ++++-- dist/showdown.js | Bin 89502 -> 89965 bytes dist/showdown.js.map | Bin 259288 -> 260620 bytes dist/showdown.min.js | Bin 37631 -> 37858 bytes dist/showdown.min.js.map | Bin 40007 -> 40175 bytes src/options.js | 5 +++++ src/subParsers/hashHTMLBlocks.js | 14 +++++++++++++- test/features/#374.escape-html-tags.html | 1 + test/features/#374.escape-html-tags.md | 1 + test/node/testsuite.features.js | 2 ++ 10 files changed, 26 insertions(+), 3 deletions(-) create mode 100644 test/features/#374.escape-html-tags.html create mode 100644 test/features/#374.escape-html-tags.md diff --git a/README.md b/README.md index 196d78c..b536619 100644 --- a/README.md +++ b/README.md @@ -198,7 +198,7 @@ var defaultOptions = showdown.getDefaultOptions(); * **noHeaderId**: (boolean) [default false] Disable the automatic generation of header ids. Setting to true overrides **prefixHeaderId** - * **customizedHeaderId**: (boolean) [default false] Use text in curly braces as header id. + * **customizedHeaderId**: (boolean) [default false] Use text in curly braces as header id. (since v1.7.0) Example: ``` ## Sample header {real-id} will use real-id as id @@ -328,7 +328,9 @@ var defaultOptions = showdown.getDefaultOptions(); NOTE: Prior to version 1.6.1, emails would always be obfuscated through dec and hex encoding. - * **openLinksInNewWindow**: (boolean) [default false] Open all links in new windows (by adding the attribute `target="_blank"` to `` tags) + * **openLinksInNewWindow**: (boolean) [default false] Open all links in new windows (by adding the attribute `target="_blank"` to `` tags) (since v1.7.0) + + * **backslashEscapesHTMLTags**: (boolean) [default false] Support for HTML Tag escaping. ex: `\
foo\
` (since v1.7.2) **NOTE**: Please note that until version 1.6.0, all of these options are ***DISABLED*** by default in the cli tool. diff --git a/dist/showdown.js b/dist/showdown.js index fd063a46b892526e1ae9a555edee968b485f0152..3483b0c47e91c90a5af12ed07b6f1074fe292b59 100644 GIT binary patch delta 394 zcmbQYoAvEJ)(vX>llL>Si6h|h5^JPr<{CXm`pD45ueO|D~M5Ja^fvHM$OIjw>TI*z#75o zfqpB=NQFC1A+uN^2IgQLh4NH|yi}meOY)&&3YjGeiFqjsNkyrN*<4(k+ipuV0RT|q BfJFcR delta 36 ucmV+<0NelVz6GAU1+XR$v&awC%99mM6qA$NQj_M}9H0a#TeCs@XeCPXq=llJ>-&y=2-CmY5 zb2V(-E(xRUvOJ34YKeoL+tkLU+~TyIintV{RhV$nBJ{hdHT_6rzB3}iJtCl2<3I;liBP6d2-pTu#YmR9keh~Bqc?$Z{sg&p~2V-tNG zd4b!Idq_%(J)Q1=EC=w_2jWP7l(LyL`Ao1vq7IzjM8$OFnw{m#q?S$j1>AO(Kb>D7 z5?k8MHC^W(^_wu3ds1XGg(o}BDCcLeOs{}2NTu`)-@004@V*kq8;Owp{DAn1>6xx< z#ba`J6$kFq;?1W+;j^iDC^gub3WpL(>Ojw-?w(K#zcIR}>F97Gp(hQ9>Pavgz&oIr zKvj!1f^vQz1cNORb)+?_>pb(ADPFltAv-%m4}S@$QE=)BL)EoZlFmwVOmsyknZI@uY0VtDjN)MBOhYFXlNdXFz@RACbfV%+%3p+tULpMb% zQ9(gbml1FR6}LZ?0p0lh9BKmmo#~1h*ZS z0YC==az>YtHUb-yU=RwIz>fh6mmo#~3X{NW9+MD@3b(+Y0WJKumYf1k)0bv^0~D9# Xa06ABdvOCIw_b4r4FR{gasyL`=3P$5 diff --git a/dist/showdown.min.js b/dist/showdown.min.js index 88e9000f29c10bbf80f1874a60e4f9cfb44e9e9c..58fbcc7541f383ea7da8698912032176f13d1d7c 100644 GIT binary patch delta 241 zcmeyrlVsfg6eoTywMvT6FbevtRw!Nm^B3xWz dTV6h0Dn7GwT-6|xNqy1*3X}0mAhSDurxnc58m0gM diff --git a/dist/showdown.min.js.map b/dist/showdown.min.js.map index 3b8a1efb1c764e12867bd67a5e56a73eb591c885..183ad972d3e11f85cb9ef2cb6db6ba7b27378a37 100644 GIT binary patch delta 6282 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 delta 6064 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 diff --git a/src/options.js b/src/options.js index efe8c6a..70c5f7e 100644 --- a/src/options.js +++ b/src/options.js @@ -125,6 +125,11 @@ function getDefaultOpts (simple) { defaultValue: false, description: 'Open all links in new windows', type: 'boolean' + }, + backslashEscapesHTMLTags: { + defaultValue: false, + description: 'Support for HTML Tag escaping. ex: \
foo\
', + type: 'boolean' } }; if (simple === false) { diff --git a/src/subParsers/hashHTMLBlocks.js b/src/subParsers/hashHTMLBlocks.js index 74b4284..b16b103 100644 --- a/src/subParsers/hashHTMLBlocks.js +++ b/src/subParsers/hashHTMLBlocks.js @@ -48,14 +48,26 @@ showdown.subParser('hashHTMLBlocks', function (text, options, globals) { return '\n\n¨K' + (globals.gHtmlBlocks.push(txt) - 1) + 'K\n\n'; }; + if (options.backslashEscapesHTMLTags) { + // encode backslash escaped HTML tags + text = text.replace(/\\<(\/?[^>]+?)>/g, function (wm, inside) { + return '<' + inside + '>'; + }); + } + + // hash HTML Blocks for (var i = 0; i < blockTags.length; ++i) { var opTagPos, - rgx1 = new RegExp('^ {0,3}<' + blockTags[i] + '\\b[^>]*>', 'im'), + rgx1 = new RegExp('^ {0,3}(<' + blockTags[i] + '\\b[^>]*>)', 'im'), patLeft = '<' + blockTags[i] + '\\b[^>]*>', patRight = ''; // 1. Look for the first position of the first opening HTML tag in the text while ((opTagPos = showdown.helper.regexIndexOf(text, rgx1)) !== -1) { + + // if the HTML tag is \ escaped, we need to escape it and break + + //2. Split the text in that position var subTexts = showdown.helper.splitAtIndex(text, opTagPos), //3. Match recursively diff --git a/test/features/#374.escape-html-tags.html b/test/features/#374.escape-html-tags.html new file mode 100644 index 0000000..25126a6 --- /dev/null +++ b/test/features/#374.escape-html-tags.html @@ -0,0 +1 @@ +

<div>foo</div>

\ No newline at end of file diff --git a/test/features/#374.escape-html-tags.md b/test/features/#374.escape-html-tags.md new file mode 100644 index 0000000..07d5f92 --- /dev/null +++ b/test/features/#374.escape-html-tags.md @@ -0,0 +1 @@ +\
foo\
diff --git a/test/node/testsuite.features.js b/test/node/testsuite.features.js index 25907eb..b538ad9 100644 --- a/test/node/testsuite.features.js +++ b/test/node/testsuite.features.js @@ -80,6 +80,8 @@ describe('makeHtml() features testsuite', function () { converter = new showdown.Converter({customizedHeaderId: true}); } else if (testsuite[i].name === '#378.simplifiedAutoLinks-with-excludeTrailingPunctuationFromURLs') { converter = new showdown.Converter({simplifiedAutoLink: true, excludeTrailingPunctuationFromURLs: true}); + } else if (testsuite[i].name === '#374.escape-html-tags') { + converter = new showdown.Converter({backslashEscapesHTMLTags: true}); } else if (testsuite[i].name === '#379.openLinksInNewWindow-breaks-em-markdup') { converter = new showdown.Converter({openLinksInNewWindow: true}); } else { From a2259c063bb0f86d1c2c1c4b545d74861ed03560 Mon Sep 17 00:00:00 2001 From: Estevao Soares dos Santos Date: Wed, 7 Jun 2017 03:33:20 +0100 Subject: [PATCH 2/7] fix(lists): fix multi paragraph lists with sublists Paragraphed lists with sublists were being parsed incorrectly due to workaround realted with simpleLineBreaks. This commit fixes this. Closes #397 --- dist/showdown.js | Bin 89965 -> 89952 bytes dist/showdown.js.map | Bin 260620 -> 260620 bytes dist/showdown.min.js | Bin 37858 -> 37828 bytes dist/showdown.min.js.map | Bin 40175 -> 40137 bytes src/subParsers/lists.js | 4 +--- src/subParsers/spanGamut.js | 5 ++++- .../#397.unordered-list-strange-behavior.html | 14 ++++++++++++++ .../#397.unordered-list-strange-behavior.md | 11 +++++++++++ 8 files changed, 30 insertions(+), 4 deletions(-) create mode 100644 test/issues/#397.unordered-list-strange-behavior.html create mode 100644 test/issues/#397.unordered-list-strange-behavior.md diff --git a/dist/showdown.js b/dist/showdown.js index 3483b0c47e91c90a5af12ed07b6f1074fe292b59..fc72478084eb25a49859eb15a31900dbdebea0b0 100644 GIT binary patch delta 207 zcmW;EF%H2{9LMpz!D4De3an^owUT1IL~==OHj*c8Wy?7fC2NQ% zLK2fikV-Mvh$k>J2_shqk&+su3_?Xl!~}sLQQ;hpUdS*O2|}SICMwMcZM2(5Rwg)A w?vqdV(};JB)W-R7u8YloK&Bt2>tcageA-6C3sUfbPYt(!*bhn@b-C diff --git a/dist/showdown.js.map b/dist/showdown.js.map index c0b71d023754bb7f64a27da427155d7a914b3d73..3bb03985b9771d380b8dabe756aea51182a43466 100644 GIT binary patch delta 496 zcmX|*KWGzi6vz4fE(!6c=F-};jnd}DB2BRMB3Lt2Y@_%GN^JsN(gx`zx!Ra;7jic! z4i>3auwcvs-_XG>S~nepgF-!Z7lX4%hdS7)LkH2tp9ns_%lm%6eBN8#S6BDdrDgV( zZ}f|?Z1z%iIG@etDY45m^cO{YJV2lO`2(CN1hBSskQ$pTh*N5qMlSO(rQ-Z2&VP;2 zrp7hO9peI{j|Fyef*La{f^U9@aOtd|J%dSiMYN9wFgJAwfA#g?#P=BaRo?AgOYo~2 z8}(Y}_~;;QjPn6}9}_fxkw-B7JWAU?SP!jhk^nCyH^UELdO3>GT|uoi8MSV)2)lw^ zZoGX)#qE5MouW)RBRoj2fpw#LKa7v2|6di@*ior7%j013Dwp^oXfdQquU9LgWX_)1zQHQeOn6O|s zCBku?RM7%C5|K>k#iAwk@ztb$+BF?F`IneV!QFoy!WT-fCJU$Zo5L`4zSIQ$f?S7E PV`O~dG4I1SW%BqRe7C2* delta 376 zcmW-Z&ntsr9KicN&o-~uvSOQU8c(QA(L29FB=00H>OGLsWbf={%WTZA8xD$t!|XYH zkDPG8D0-z$@@FVoO1ar#CoW!&pFW>Hhh^Jg*|xg}x8%%=7hZCSc`tEc*iS6HcrWtn zKCyCImZt|~d1Mo1FRAClAEV|!?Bc5I&}SQn3oz9JZbP*5;)|VUq5}F?!HRbd;z7kj zL@Wl09akoynqU7|_-?m|N|;phz_BIkG;w9Z%D-K9W8lWd10!eSAn3h}j5(lR-{~Pe z%~c_Qs5*P7pb(F>&{{6+b=3KTraj9-bjn03CQV33WJk3TCW0fi=vm zL)E?#BDxZywJIuRD&TT~&PbBP(%MQwo!3}2wGl~ZED=v?k+h~Rt+B26dW@;;U&m63 zsFuc;JZ-|OI2Gvgc@Q58^cCOpwCl=00L!qR!*v5Q=ku;Nr4Dz)O K=(#sKTmK6tLxOw& diff --git a/dist/showdown.min.js b/dist/showdown.min.js index 58fbcc7541f383ea7da8698912032176f13d1d7c..e396e6ccdad31a8a444222f9679884fbf4c98017 100644 GIT binary patch delta 138 zcmaE~oaxANCVqV_MTO#w{PL9i@;n6t^Nsuw)svg5oi^XE&SVrSODs~zvQ5$}PE9OI z&d|uvPATR&Y#$tI~tLEkPWPf1hLD$#bcZ~Igp0Jotqy8r+H delta 165 zcmX@IoaxbWCVqV_MTO#w{PL9i@;n6tqmBF#)v`HyMX3cjiOH!N`Z0MidHU%(N{3cB zDQW8D*rwZ0Ugst?xw%?xGFLSp4^S8+3sR-Dc|~;=qYzhFVv$0YZIWJbYGP4xhDL_w yW|i7QoQ8=Yq0HQZoK&C8yi}*6)Wqy!`$S}mKnB?)6)EW30S(i%+N|F`l?MQla5#+s diff --git a/dist/showdown.min.js.map b/dist/showdown.min.js.map index 183ad972d3e11f85cb9ef2cb6db6ba7b27378a37..9ae0b62e2343ff2d620b0df4d26796cbae71a7ca 100644 GIT binary patch delta 170 zcmaFAlj-D6rVV=a92TzT&N}{%Rg=x?PjM8w-mD#4h$*`jqRJ4e2=BhVo^&XXCPWhU4A ziBI;8b4$M~F93Q5Pw@Z% diff --git a/src/subParsers/lists.js b/src/subParsers/lists.js index 8118714..1b2c07d 100644 --- a/src/subParsers/lists.js +++ b/src/subParsers/lists.js @@ -93,16 +93,14 @@ showdown.subParser('lists', function (text, options, globals) { item = showdown.subParser('lists')(item, options, globals); item = item.replace(/\n$/, ''); // chomp(item) item = showdown.subParser('hashHTMLBlocks')(item, options, globals); + // Colapse double linebreaks item = item.replace(/\n\n+/g, '\n\n'); - // replace double linebreaks with a placeholder - item = item.replace(/\n\n/g, '¨B'); if (isParagraphed) { item = showdown.subParser('paragraphs')(item, options, globals); } else { item = showdown.subParser('spanGamut')(item, options, globals); } - item = item.replace(/¨B/g, '\n\n'); } // now we need to remove the marker (¨A) diff --git a/src/subParsers/spanGamut.js b/src/subParsers/spanGamut.js index b829ba4..489907c 100644 --- a/src/subParsers/spanGamut.js +++ b/src/subParsers/spanGamut.js @@ -32,7 +32,10 @@ showdown.subParser('spanGamut', function (text, options, globals) { // Do hard breaks if (options.simpleLineBreaks) { // GFM style hard breaks - text = text.replace(/\n/g, '
\n'); + // only add line breaks if the text does not contain a block (special case for lists) + if (!/\n\n¨K/.test(text)) { + text = text.replace(/\n+/g, '
\n'); + } } else { // Vanilla hard breaks text = text.replace(/ +\n/g, '
\n'); diff --git a/test/issues/#397.unordered-list-strange-behavior.html b/test/issues/#397.unordered-list-strange-behavior.html new file mode 100644 index 0000000..bab378d --- /dev/null +++ b/test/issues/#397.unordered-list-strange-behavior.html @@ -0,0 +1,14 @@ +
    +

  • Customer – Opens the Customer List. Refer to the document “Customer Management”.

    +
      +
    • Customer List
      • +
    • New Customer
      • +
    • Customer Prices
      • +
    • Appointments
    • +

  • Designer - Opens the Designer List. Refer to the document “Designer Commissions”.

    +
      +
    • Designer List
      • +
    • New Designer
      • +
    • Designer Payment List
      • +
    • New Designer Payment
    • +
diff --git a/test/issues/#397.unordered-list-strange-behavior.md b/test/issues/#397.unordered-list-strange-behavior.md new file mode 100644 index 0000000..59bc46b --- /dev/null +++ b/test/issues/#397.unordered-list-strange-behavior.md @@ -0,0 +1,11 @@ +- **Customer** – Opens the Customer List. Refer to the document “Customer Management”. + - Customer List + - New Customer + - Customer Prices + - Appointments + +- **Designer** - Opens the Designer List. Refer to the document “Designer Commissions”. + - Designer List + - New Designer + - Designer Payment List + - New Designer Payment \ No newline at end of file From 1194d8803ed1a96a6b38af30831529dcc6a85cbd Mon Sep 17 00:00:00 2001 From: Tobi Date: Thu, 22 Jun 2017 04:16:53 +0200 Subject: [PATCH 3/7] fix(githubMentions): githubMentions now works with openLinksInNewWindow options githubMentions links can now be opened in new windows when using the option openLinksInNewWindow Closes #403 --- CHANGELOG.md | 2 +- package.json | 2 +- src/subParsers/anchors.js | 8 ++++++-- 3 files changed, 8 insertions(+), 4 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 1971756..14a2923 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -10,7 +10,7 @@ Important HOTFIX -# [1.7.0](https://github.com/showdownjs/showdown/compare/1.6.4...1.7.0) (2017-06-01) +## [1.7.0](https://github.com/showdownjs/showdown/compare/1.6.4...1.7.0) (2017-06-01) (DEPRECATED) diff --git a/package.json b/package.json index 5563685..24a9b31 100644 --- a/package.json +++ b/package.json @@ -55,7 +55,7 @@ "quiet-grunt": "^0.2.3", "semver": "^5.0.0", "semver-sort": "0.0.4", - "sinon": "^1.14.1", + "sinon": "^2.3.3", "source-map-support": "^0.4.15" }, "dependencies": { diff --git a/src/subParsers/anchors.js b/src/subParsers/anchors.js index 5779368..49676ea 100644 --- a/src/subParsers/anchors.js +++ b/src/subParsers/anchors.js @@ -82,8 +82,12 @@ showdown.subParser('anchors', function (text, options, globals) { if (!showdown.helper.isString(options.ghMentionsLink)) { throw new Error('ghMentionsLink option must be a string'); } - var lnk = options.ghMentionsLink.replace(/\{u}/g, username); - return st + '' + mentions + ''; + var lnk = options.ghMentionsLink.replace(/\{u}/g, username), + target = ''; + if (options.openLinksInNewWindow) { + target = ' target="¨E95Eblank"'; + } + return st + '' + mentions + ''; }); } From 51e46933a483fb9324ac83c0751f5162833d2ebb Mon Sep 17 00:00:00 2001 From: Estevao Soares dos Santos Date: Fri, 4 Aug 2017 20:19:15 +0100 Subject: [PATCH 4/7] fix(tablesHeaderId): fix missmatch of option name In code, the option appeared both as 'tableHeaderId' and 'tablesHeaderId', although only the first form had effect. In documentation was referenced as 'tablesHeaderId'. Option is now fixed in code to reflex the documentation and table parser accepts both forms, with and without an s. Closes #412 --- dist/showdown.js | Bin 89952 -> 90230 bytes dist/showdown.js.map | Bin 260620 -> 261331 bytes dist/showdown.min.js | Bin 37828 -> 37918 bytes dist/showdown.min.js.map | Bin 40137 -> 40227 bytes src/subParsers/tables.js | 3 ++- test/node/testsuite.features.js | 2 +- 6 files changed, 3 insertions(+), 2 deletions(-) diff --git a/dist/showdown.js b/dist/showdown.js index fc72478084eb25a49859eb15a31900dbdebea0b0..75874b3b27e59af7f253896a11a1de818a92ae46 100644 GIT binary patch delta 221 zcmaE`kM-LDR$*&>Ek%XmjQsMH{PH{n0~1{Xi;co!)0uR*CR@&yo$NG6XL7+D4aVBZ zTGKTrADSb)Ibyox&U$@)h2qkJg8ZTqg{1tF426=!q@2`ZkJQAJ)FRImg~YrRh!9*P zr8HHcBwr!5s3^ZkAu~@QB|o_|H#M&$Ge1wEIA5VW6)2LY4m7POH8EQuDKR;_Jh3RH tSRpw-w;-`3GbuACv!s$s0SGeF6f~sr3qU%H_0a6CsZrQo8o>CP4*;rjPs{)S delta 52 zcmV-40L%aOzy;vG1rs|jDj^_qXm599Z+C7WFgGnQHn9^HmjOGIotG)I)R!K)1Zid< KD7TAI0qYL>WfK$t diff --git a/dist/showdown.js.map b/dist/showdown.js.map index 3bb03985b9771d380b8dabe756aea51182a43466..507224d89cc8b9151854b09f22e3b289c9ea6b2d 100644 GIT binary patch delta 484 zcmZ9GJ!=$E6o$F?W*`}qA+sO4yWpM}!F;ScCY_|&F+ny$Dh;9p+`BttG9-KNFf&UG zBxbcRO$zZAr*jQ9rVuPNTiC3BKneZ;Q(2@^QN+%>1X6g)=RD^<@9r<_%U`Sgj{M9G zEV}NZdOVa-&%8mL8zT1eTLym55)+R`NKP%!*!Xgbnku|$s<&AKFI^-yeK?CFlw|Nv zj@-lES(4T(6Tu@XtTi=1D$%q8dq92tk-^Gul1DK?rm=F3HkosyiiZoNs1_bs*fxlz z;Dx!KaaB#esoysV1n)UwjBrJRv5}Cfx1jqAmQ~jKd$=R z^P_nWxbRNUDe+o9Boh26k`V*~JlSY9eUSuGKrCV1*F;>_X_3!Yq0Sqt>pb#eXvk*B ilb{}~1`-8aYVzV#22*rG`Q delta 199 zcmV;&0672C`45cr4}i1*@)-n8K|xKEA)ghKaO4@2P)`MyuT=sCmw-(H1(#5Q0t%PF z4FMRJAoKwclMt*Am*9E<50_wS0SE#wM3-M10muV0Mo5!kG!>H|rV5iyeh-&`1pyC} zAV3O-aU21+aU22?RF^P20R@-v76A&Eja~v5lf(NLlOUxJmvF)X8MnZ30xcE-a7mXj zpaCzFp!gJ%AQB3bAf^hJz^MTWw@`=zD5C*8m+~tEEVnEy1FpcAR_y~3w}I^gQV*lc BL}CB{ diff --git a/dist/showdown.min.js b/dist/showdown.min.js index e396e6ccdad31a8a444222f9679884fbf4c98017..cdcbe50545f8801b04980b575c885d79db5bd716 100644 GIT binary patch delta 147 zcmX@IoN3+)CLw(-MTO#w{PL9i@;n6t6I}y~jY10cY-Nc>3K_PO-R+h6buw+0l&p(V zOG=CK6q58NKjadb%;_X2nXIjDlce`bn?3MYo)s^hjwbQhfZ1fZDlxim{y2x(6V;^Qa*|^r6k!y2S?R!4{B)yWvq?}Zb Q)Wnq3BF~h~H9d>i0hhib;{X5v diff --git a/dist/showdown.min.js.map b/dist/showdown.min.js.map index 9ae0b62e2343ff2d620b0df4d26796cbae71a7ca..276717b9d23f74d0921f5f6e1a9ec27b0e24aef6 100644 GIT binary patch delta 7670 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 diff --git a/src/subParsers/tables.js b/src/subParsers/tables.js index dcd74c9..6ce7bc6 100644 --- a/src/subParsers/tables.js +++ b/src/subParsers/tables.js @@ -22,7 +22,8 @@ showdown.subParser('tables', function (text, options, globals) { function parseHeaders (header, style) { var id = ''; header = header.trim(); - if (options.tableHeaderId) { + // support both tablesHeaderId and tableHeaderId due to error in documention so we don't break backwards compatibility + if (options.tablesHeaderId || options.tableHeaderId) { id = ' id="' + header.replace(/ /g, '_').toLowerCase() + '"'; } header = showdown.subParser('spanGamut')(header, options, globals); diff --git a/test/node/testsuite.features.js b/test/node/testsuite.features.js index b538ad9..b4234ad 100644 --- a/test/node/testsuite.features.js +++ b/test/node/testsuite.features.js @@ -97,7 +97,7 @@ describe('makeHtml() features testsuite', function () { 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}); + converter = new showdown.Converter({tables: true, tablesHeaderId: true}); } else if (suite[i].name === '#179.parse-md-in-table-ths') { converter = new showdown.Converter({tables: true, strikethrough: true}); } else { From 209e9f134a272c5fa7448a594fe0d8acc665cbd6 Mon Sep 17 00:00:00 2001 From: Estevao Soares dos Santos Date: Sat, 5 Aug 2017 01:43:46 +0100 Subject: [PATCH 5/7] release 1.7.2 --- CHANGELOG.md | 17 +++++++++++++++++ dist/showdown.js | Bin 90230 -> 90230 bytes dist/showdown.min.js | Bin 37918 -> 37918 bytes package.json | 2 +- performance.json | 2 +- performance.log.md | 41 +++++++++++++++++++++++++++++++++++++++++ 6 files changed, 60 insertions(+), 2 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 14a2923..76f0241 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,3 +1,20 @@ + +## [1.7.2](https://github.com/showdownjs/showdown/compare/1.7.1...1.7.2) (2017-08-05) + + +### Bug Fixes + +* **githubMentions:** githubMentions now works with openLinksInNewWindow options ([1194d88](https://github.com/showdownjs/showdown/commit/1194d88)), closes [#403](https://github.com/showdownjs/showdown/issues/403) +* **lists:** fix multi paragraph lists with sublists ([a2259c0](https://github.com/showdownjs/showdown/commit/a2259c0)), closes [#397](https://github.com/showdownjs/showdown/issues/397) +* **tablesHeaderId:** fix missmatch of option name ([51e4693](https://github.com/showdownjs/showdown/commit/51e4693)), closes [#412](https://github.com/showdownjs/showdown/issues/412) + + +### Features + +* **backslashEscapesHTMLTags:** backslash escapes HTML tags ([5a5aff6](https://github.com/showdownjs/showdown/commit/5a5aff6)), closes [#374](https://github.com/showdownjs/showdown/issues/374) + + + ## [1.7.1](https://github.com/showdownjs/showdown/compare/1.7.0...1.7.1) (2017-06-02) diff --git a/dist/showdown.js b/dist/showdown.js index 75874b3b27e59af7f253896a11a1de818a92ae46..60c2af5166e5ce7a60f3b9f9f5fc1348204f41d4 100644 GIT binary patch delta 30 lcmex%fc4t}Rsm~$Ek%XmjQsMH{PH{n1Jg!`S)3U>ei delta 30 lcmex%fc4t}Rsm~$Ek%XmjQsMH{PH{n1CvI9tpbc`2>`Sy3U&Yh diff --git a/dist/showdown.min.js b/dist/showdown.min.js index cdcbe50545f8801b04980b575c885d79db5bd716..7a03a18235c4c50e67533d8045fa658eaa92908b 100644 GIT binary patch delta 26 hcmbQYf@$6gCVqV_MTO#w{PL9i@;n6t(~bQ6Qvi4A2%7)^ delta 26 hcmbQYf@$6gCVqV_MTO#w{PL9i@;n6tla2iRQvi452$}!@ diff --git a/package.json b/package.json index 24a9b31..159352a 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "showdown", - "version": "1.7.1", + "version": "1.7.2", "description": "A Markdown to HTML converter written in Javascript", "author": "Estevão Santos", "homepage": "http://showdownjs.github.io/showdown/", diff --git a/performance.json b/performance.json index ea0579e..def5595 100644 --- a/performance.json +++ b/performance.json @@ -1 +1 @@ -{"1.7.1":[{"suiteName":"Basic","cycles":50,"tests":[{"name":"Simple \"Hello World\"","time":1.0738219599999979,"maxTime":20.566299000000072,"minTime":0.3242529999999988},{"name":"performance.testfile.md","time":30.4629232,"maxTime":82.115725,"minTime":26.02165500000001}]},{"suiteName":"subParsers","cycles":20,"tests":[{"name":"hashHTMLBlocks","time":4.232850950000011,"maxTime":9.06222600000001,"minTime":2.35927700000002},{"name":"anchors","time":0.35050129999999624,"maxTime":0.7627189999998336,"minTime":0.28568100000029517},{"name":"autoLinks","time":0.08923019999999723,"maxTime":0.19015300000000934,"minTime":0.06509199999982229},{"name":"blockQuotes","time":2.073701349999965,"maxTime":4.988563999999769,"minTime":1.7291510000000017},{"name":"codeBlocks","time":0.2560277500000211,"maxTime":0.9369000000001506,"minTime":0.1790019999998549},{"name":"codeSpans","time":0.24160820000001876,"maxTime":0.8386599999998907,"minTime":0.1576060000002144},{"name":"detab","time":0.09915939999998499,"maxTime":0.16815399999995861,"minTime":0.08618599999999788},{"name":"encodeAmpsAndAngles","time":0.13123839999998382,"maxTime":0.646096999999827,"minTime":0.09311699999989287},{"name":"encodeBackslashEscapes","time":0.07607604999996057,"maxTime":0.1404299999999239,"minTime":0.07021399999985078},{"name":"encodeCode","time":0.9938553500000807,"maxTime":1.7056470000002264,"minTime":0.8648769999999786},{"name":"escapeSpecialCharsWithinTagAttributes","time":0.26711740000000644,"maxTime":0.37518199999976787,"minTime":0.24951800000008006},{"name":"githubCodeBlocks","time":0.19164420000001883,"maxTime":0.9664330000000518,"minTime":0.14012899999988804},{"name":"hashBlock","time":0.05914020000000164,"maxTime":0.39748199999985445,"minTime":0.03646299999991243},{"name":"hashElement","time":0.0017327499999964858,"maxTime":0.030737999999928434,"minTime":0},{"name":"hashHTMLSpans","time":4.116996499999937,"maxTime":5.5849379999999655,"minTime":3.89044100000001},{"name":"hashPreCodeTags","time":0.1423884499999531,"maxTime":0.5294739999999365,"minTime":0.1081850000000486},{"name":"headers","time":1.1452692999999954,"maxTime":4.103494999999839,"minTime":0.8639729999999872},{"name":"horizontalRule","time":0.21682209999996757,"maxTime":0.36583999999993466,"minTime":0.19407000000001062},{"name":"images","time":0.15055509999997413,"maxTime":0.5526780000000144,"minTime":0.11662299999989045},{"name":"italicsAndBold","time":0.3119285999999647,"maxTime":1.2412650000001122,"minTime":0.23625899999979083},{"name":"lists","time":4.022899600000005,"maxTime":7.077227000000221,"minTime":2.4975970000000416},{"name":"outdent","time":0.17451229999999213,"maxTime":0.26066899999977977,"minTime":0.14826499999981024},{"name":"paragraphs","time":6.5566433999999845,"maxTime":8.645457999999962,"minTime":4.997002000000066},{"name":"spanGamut","time":5.072655700000018,"maxTime":6.34705299999996,"minTime":4.136643999999706},{"name":"strikethrough","time":0.006192800000076204,"maxTime":0.11029400000006717,"minTime":0},{"name":"stripLinkDefinitions","time":0.16428144999997585,"maxTime":0.27694100000007893,"minTime":0.1416349999999511},{"name":"tables","time":0.004354600000010578,"maxTime":0.08015999999997803,"minTime":0},{"name":"unescapeSpecialChars","time":0.009130899999991015,"maxTime":0.04580600000008417,"minTime":0.006930999999894993}]}],"1.7.0":[{"suiteName":"Basic","cycles":50,"tests":[{"name":"Simple \"Hello World\"","time":0.39255787999999486,"maxTime":9.953321000000074,"minTime":0.09673299999997198},{"name":"performance.testfile.md","time":29.416470079999975,"maxTime":54.25341800000001,"minTime":25.948727999999846}]},{"suiteName":"subParsers","cycles":20,"tests":[{"name":"hashHTMLBlocks","time":4.0619999999999665,"maxTime":7.184810000000198,"minTime":2.325826999999663},{"name":"anchors","time":0.4883242500000051,"maxTime":4.085716999999931,"minTime":0.28085900000041875},{"name":"autoLinks","time":0.08583980000000793,"maxTime":0.19979499999999462,"minTime":0.06298299999980372},{"name":"blockQuotes","time":2.071019450000017,"maxTime":4.554016000000047,"minTime":1.7333710000002611},{"name":"codeBlocks","time":0.2531195000000025,"maxTime":0.8639729999999872,"minTime":0.17809799999986353},{"name":"codeSpans","time":0.2609549000000243,"maxTime":0.5924559999998564,"minTime":0.15971599999966202},{"name":"detab","time":0.09453374999998232,"maxTime":0.1298820000001797,"minTime":0.08859699999993609},{"name":"encodeAmpsAndAngles","time":0.10304694999997537,"maxTime":0.19196099999999205,"minTime":0.09462400000029447},{"name":"encodeBackslashEscapes","time":0.1064521499999728,"maxTime":0.5894419999999627,"minTime":0.07051600000022518},{"name":"encodeCode","time":0.9265486000000009,"maxTime":1.1821999999997388,"minTime":0.8347420000000056},{"name":"escapeSpecialCharsWithinTagAttributes","time":0.2759772000000112,"maxTime":0.6171669999998812,"minTime":0.24530000000004293},{"name":"githubCodeBlocks","time":0.1951549499999828,"maxTime":0.9799929999999222,"minTime":0.1386210000000574},{"name":"hashBlock","time":0.062304449999965074,"maxTime":0.4833670000002712,"minTime":0.03495699999984936},{"name":"hashElement","time":0.0014464500000030966,"maxTime":0.024711000000024796,"minTime":0},{"name":"hashHTMLSpans","time":4.1203715999999755,"maxTime":4.609765000000152,"minTime":3.8587989999996353},{"name":"hashPreCodeTags","time":0.14734550000000582,"maxTime":0.5351989999999205,"minTime":0.10487000000011903},{"name":"headers","time":1.3076671999999916,"maxTime":4.252966000000015,"minTime":0.8564390000001367},{"name":"horizontalRule","time":0.2203779999999597,"maxTime":0.3742779999997765,"minTime":0.19407000000001062},{"name":"images","time":0.15025354999997945,"maxTime":0.506872000000385,"minTime":0.1163219999998546},{"name":"italicsAndBold","time":0.30579589999997553,"maxTime":0.872110000000248,"minTime":0.24138200000015786},{"name":"lists","time":3.447394599999984,"maxTime":4.893336999999974,"minTime":2.407492000000275},{"name":"outdent","time":0.26698190000001887,"maxTime":0.8684939999998278,"minTime":0.1808109999997214},{"name":"paragraphs","time":5.866655149999997,"maxTime":8.331147999999757,"minTime":4.9695779999997285},{"name":"spanGamut","time":5.038527899999986,"maxTime":7.123635999999806,"minTime":4.11615299999994},{"name":"strikethrough","time":0.003992900000002919,"maxTime":0.07322800000019924,"minTime":0},{"name":"stripLinkDefinitions","time":0.15298084999997172,"maxTime":0.24288900000010472,"minTime":0.13952599999993254},{"name":"tables","time":0.0024410000000443686,"maxTime":0.043695999999727064,"minTime":0},{"name":"unescapeSpecialChars","time":0.008663700000033714,"maxTime":0.0406820000002881,"minTime":0.006628999999975349}]}],"1.6.4":[{"suiteName":"Basic","cycles":50,"tests":[{"name":"Simple \"Hello World\"","time":0.37575447999999595,"maxTime":6.3811059999999316,"minTime":0.182617999999934},{"name":"performance.testfile.md","time":33.83478732000001,"maxTime":61.04858100000001,"minTime":30.186325000000124}]},{"suiteName":"subParsers","cycles":20,"tests":[{"name":"hashHTMLBlocks","time":2.5643760500000328,"maxTime":8.346818999999869,"minTime":1.8710879999998724},{"name":"anchors","time":0.4985702000000174,"maxTime":4.221624999999676,"minTime":0.27031199999964883},{"name":"autoLinks","time":0.08000864999996793,"maxTime":0.17357799999990675,"minTime":0.06087299999990137},{"name":"blockQuotes","time":3.3429765499999804,"maxTime":7.305651000000125,"minTime":2.8504790000001776},{"name":"codeBlocks","time":0.22134235000003172,"maxTime":0.8220859999996719,"minTime":0.17176999999992404},{"name":"codeSpans","time":0.22901160000001256,"maxTime":0.7443360000002031,"minTime":0.15579799999977695},{"name":"detab","time":0.0973213499999929,"maxTime":0.15429100000028484,"minTime":0.08618699999988166},{"name":"encodeAmpsAndAngles","time":0.11678870000000643,"maxTime":0.19979600000033315,"minTime":0.09432200000037483},{"name":"encodeBackslashEscapes","time":0.08623155000002498,"maxTime":0.2296289999999317,"minTime":0.06810499999983222},{"name":"encodeCode","time":0.8853238499999861,"maxTime":1.1647219999999834,"minTime":0.8163599999998041},{"name":"escapeSpecialCharsWithinTagAttributes","time":0.2983526000000438,"maxTime":0.4954210000000785,"minTime":0.2401769999996759},{"name":"githubCodeBlocks","time":0.18343240000001515,"maxTime":0.7847170000000006,"minTime":0.1331980000004478},{"name":"hashBlock","time":0.0443587499999694,"maxTime":0.09763799999973344,"minTime":0.035257999999885214},{"name":"hashElement","time":0.00200395000001663,"maxTime":0.03345000000035725,"minTime":0},{"name":"hashHTMLSpans","time":4.199521549999963,"maxTime":4.551605000000109,"minTime":3.9874759999997877},{"name":"hashPreCodeTags","time":0.1295205500000293,"maxTime":0.3134050000003299,"minTime":0.10637700000006589},{"name":"headers","time":1.2236204000000044,"maxTime":4.009776000000329,"minTime":0.944735000000037},{"name":"horizontalRule","time":0.41190154999999323,"maxTime":4.175217999999859,"minTime":0.19648000000006505},{"name":"images","time":0.08806979999997111,"maxTime":0.20250800000030722,"minTime":0.0732279999997445},{"name":"italicsAndBold","time":0.2764291999999841,"maxTime":0.4137550000000374,"minTime":0.23324500000035187},{"name":"lists","time":5.0047764500000085,"maxTime":6.109288000000106,"minTime":4.663406000000123},{"name":"outdent","time":0.1521370000000161,"maxTime":0.3366089999999531,"minTime":0.13922500000035143},{"name":"paragraphs","time":5.336081549999994,"maxTime":7.117005000000063,"minTime":4.843312999999853},{"name":"spanGamut","time":4.449883849999901,"maxTime":6.152983999999833,"minTime":3.8569910000001073},{"name":"strikethrough","time":0.002606700000001183,"maxTime":0.04881900000009409,"minTime":0},{"name":"stripLinkDefinitions","time":0.18040370000001077,"maxTime":0.3161169999998492,"minTime":0.14705999999978303},{"name":"tables","time":0.0031190500000320754,"maxTime":0.05544899999995323,"minTime":0},{"name":"unescapeSpecialChars","time":0.009281650000002629,"maxTime":0.047313000000031025,"minTime":0.006628999999975349}]}],"1.6.3":[{"suiteName":"Basic","cycles":50,"tests":[{"name":"Simple \"Hello World\"","time":0.3880986600000119,"maxTime":6.064399999999978,"minTime":0.17418099999997594},{"name":"performance.testfile.md","time":26.898552680000012,"maxTime":49.06275100000005,"minTime":24.84523399999989}]},{"suiteName":"subParsers","cycles":20,"tests":[{"name":"hashHTMLBlocks","time":2.6158222500000194,"maxTime":8.18079200000011,"minTime":1.8985149999998612},{"name":"anchors","time":0.5154769000000442,"maxTime":4.690839000000324,"minTime":0.2639840000001641},{"name":"autoLinks","time":0.09307249999999385,"maxTime":0.18834400000014284,"minTime":0.07262600000012753},{"name":"blockQuotes","time":4.5183903999999755,"maxTime":8.952854000000116,"minTime":3.035816000000068},{"name":"codeBlocks","time":0.22262349999998604,"maxTime":0.347758999999769,"minTime":0.18834500000002663},{"name":"codeSpans","time":0.31763950000004115,"maxTime":1.0948100000000522,"minTime":0.1771950000002107},{"name":"detab","time":0.0919273999999632,"maxTime":0.13651200000003882,"minTime":0.08739199999990888},{"name":"encodeAmpsAndAngles","time":0.0438916999999492,"maxTime":0.08919999999989159,"minTime":0.038271000000349886},{"name":"encodeBackslashEscapes","time":0.10785369999998692,"maxTime":0.2651890000001913,"minTime":0.07835100000011153},{"name":"encodeCode","time":1.5346329500000138,"maxTime":9.895783999999821,"minTime":0.8645779999997103},{"name":"escapeSpecialCharsWithinTagAttributes","time":0.2937122499999759,"maxTime":0.5234480000003714,"minTime":0.25343700000030367},{"name":"githubCodeBlocks","time":0.20775164999997742,"maxTime":0.7901440000000548,"minTime":0.1416349999999511},{"name":"hashBlock","time":0.042234400000006646,"maxTime":0.12325299999974959,"minTime":0.035860999999840715},{"name":"hashElement","time":0.0016724999999951252,"maxTime":0.028929000000061933,"minTime":0},{"name":"hashHTMLSpans","time":0.4103353000000197,"maxTime":1.5980680000002394,"minTime":0.2404790000000503},{"name":"hashPreCodeTags","time":0.13196184999997057,"maxTime":0.3950719999998,"minTime":0.11029400000006717},{"name":"headers","time":1.0150126000000683,"maxTime":1.501936999999998,"minTime":0.8055130000002464},{"name":"horizontalRule","time":0.22018260000002102,"maxTime":0.35710100000005696,"minTime":0.1946739999998499},{"name":"images","time":0.1582398000000012,"maxTime":0.978186999999707,"minTime":0.07684500000004846},{"name":"italicsAndBold","time":0.28757974999998626,"maxTime":0.6394679999998516,"minTime":0.24078000000008615},{"name":"lists","time":5.151319100000023,"maxTime":6.331397000000379,"minTime":4.629061999999976},{"name":"outdent","time":0.18019314999994548,"maxTime":0.36342999999988024,"minTime":0.14253999999982625},{"name":"paragraphs","time":4.547636500000022,"maxTime":6.308794999999918,"minTime":4.002250999999887},{"name":"spanGamut","time":1.5190982500000245,"maxTime":1.863557999999557,"minTime":1.3720530000000508},{"name":"strikethrough","time":0.003450399999996989,"maxTime":0.06539299999985815,"minTime":0},{"name":"stripLinkDefinitions","time":0.1786111499999606,"maxTime":0.3128030000002582,"minTime":0.1443480000002637},{"name":"tables","time":0.0035106999999925392,"maxTime":0.06268099999988408,"minTime":0.00030099999958110857},{"name":"unescapeSpecialChars","time":0.01146649999998317,"maxTime":0.04881900000009409,"minTime":0.006628999999975349}]}],"1.6.2":[{"suiteName":"Basic","cycles":50,"tests":[{"name":"Simple \"Hello World\"","time":0.6130621400000001,"maxTime":5.893518999999998,"minTime":0.16875699999999938},{"name":"performance.testfile.md","time":25.970254839999992,"maxTime":62.88168,"minTime":23.709682999999927}]},{"suiteName":"subParsers","cycles":20,"tests":[{"name":"hashHTMLBlocks","time":2.6685977000000323,"maxTime":8.478507000000036,"minTime":1.8846490000000813},{"name":"anchors","time":0.5002727000000278,"maxTime":3.841318999999885,"minTime":0.2676000000001295},{"name":"autoLinks","time":0.09846654999997781,"maxTime":0.21064500000011321,"minTime":0.07202299999994466},{"name":"blockQuotes","time":3.221817550000014,"maxTime":5.825714999999946,"minTime":2.791112000000112},{"name":"codeBlocks","time":0.17663659999998343,"maxTime":0.3712639999998828,"minTime":0.1570040000001427},{"name":"codeSpans","time":0.2181328999999778,"maxTime":0.483066000000008,"minTime":0.15097700000001169},{"name":"detab","time":0.13492999999998573,"maxTime":0.6545340000000124,"minTime":0.08498099999997066},{"name":"encodeAmpsAndAngles","time":0.04158639999994875,"maxTime":0.11752699999988181,"minTime":0.03616199999987657},{"name":"encodeBackslashEscapes","time":0.0800689000000034,"maxTime":0.13319799999999304,"minTime":0.06780399999979636},{"name":"encodeCode","time":0.5599700499999927,"maxTime":0.9821019999999407,"minTime":0.48396900000011556},{"name":"escapeSpecialCharsWithinTagAttributes","time":0.35280645000001415,"maxTime":0.5683480000000145,"minTime":0.2914060000000518},{"name":"githubCodeBlocks","time":0.17996669999999995,"maxTime":0.7729650000001129,"minTime":0.1274710000000141},{"name":"hashBlock","time":0.057723849999990764,"maxTime":0.31159699999989243,"minTime":0.037368000000014945},{"name":"hashElement","time":0.0025463500000000748,"maxTime":0.04610600000000886,"minTime":0},{"name":"hashHTMLSpans","time":0.47458235000001425,"maxTime":2.325223000000051,"minTime":0.2344510000000355},{"name":"hashPreCodeTags","time":0.12186629999998785,"maxTime":0.3073779999999715,"minTime":0.10697999999979402},{"name":"headers","time":0.8577350000000024,"maxTime":0.9540770000000975,"minTime":0.7801970000000438},{"name":"horizontalRule","time":0.22663095000001476,"maxTime":0.41797300000007453,"minTime":0.1967819999999847},{"name":"images","time":0.17053435000000264,"maxTime":1.4528119999999944,"minTime":0.07714599999985694},{"name":"italicsAndBold","time":0.10093754999998054,"maxTime":0.20220699999981662,"minTime":0.0882960000001276},{"name":"lists","time":4.9306124000000064,"maxTime":5.460477999999966,"minTime":4.55642499999999},{"name":"outdent","time":0.16260889999998654,"maxTime":0.31461000000012973,"minTime":0.1416349999999511},{"name":"paragraphs","time":3.7896679000000177,"maxTime":5.563840999999911,"minTime":3.278396000000157},{"name":"spanGamut","time":1.4417527499999891,"maxTime":2.0124210000001312,"minTime":1.2032939999999144},{"name":"strikethrough","time":0.004233999999985372,"maxTime":0.08196800000018811,"minTime":0},{"name":"stripBlankLines","time":0.08623144999999113,"maxTime":0.1304850000001352,"minTime":0.0804600000001301},{"name":"stripLinkDefinitions","time":0.15983660000002828,"maxTime":0.21727400000008856,"minTime":0.1446480000001884},{"name":"tables","time":0.004143600000008974,"maxTime":0.07593999999994594,"minTime":0},{"name":"unescapeSpecialChars","time":0.00991439999999102,"maxTime":0.0581609999999273,"minTime":0.006628999999975349}]}],"1.6.1":[{"suiteName":"Basic","cycles":50,"tests":[{"name":"Simple \"Hello World\"","time":0.3172682400000001,"maxTime":5.4981469999999995,"minTime":0.16062000000000154},{"name":"readme.md","time":26.0144148,"maxTime":46.79858399999999,"minTime":24.245484999999917}]},{"suiteName":"subParsers","cycles":20,"tests":[{"name":"hashHTMLBlocks","time":2.6414157500000215,"maxTime":7.791727999999921,"minTime":1.9364810000001853},{"name":"anchors","time":0.47462755000000245,"maxTime":4.062812000000122,"minTime":0.25885999999991327},{"name":"autoLinks","time":0.08906409999998459,"maxTime":0.19708299999979317,"minTime":0.06870800000001509},{"name":"blockQuotes","time":3.213485000000014,"maxTime":6.05383699999993,"minTime":2.880010000000084},{"name":"codeBlocks","time":0.16200620000001892,"maxTime":0.2691060000001926,"minTime":0.15308599999980288},{"name":"codeSpans","time":0.169494799999984,"maxTime":0.39868699999988166,"minTime":0.1410319999999956},{"name":"detab","time":0.12471390000000611,"maxTime":0.6647800000000643,"minTime":0.08558400000015354},{"name":"encodeAmpsAndAngles","time":0.04181244999999763,"maxTime":0.08920000000011896,"minTime":0.03796999999985928},{"name":"encodeBackslashEscapes","time":0.07586505000000443,"maxTime":0.13289599999984603,"minTime":0.06810500000005959},{"name":"encodeCode","time":0.5765897500000051,"maxTime":0.970348999999942,"minTime":0.4791480000001229},{"name":"escapeSpecialCharsWithinTagAttributes","time":0.24603789999998754,"maxTime":0.35047099999997045,"minTime":0.22119199999997363},{"name":"githubCodeBlocks","time":0.1767573999999968,"maxTime":0.815454999999929,"minTime":0.1250600000000759},{"name":"hashBlock","time":0.06537804999999253,"maxTime":0.42972599999984595,"minTime":0.0376690000000508},{"name":"hashElement","time":0.0020039500000052614,"maxTime":0.034051999999974214,"minTime":0},{"name":"hashHTMLSpans","time":0.42437735000000887,"maxTime":2.3210050000000138,"minTime":0.24078000000008615},{"name":"hashPreCodeTags","time":0.12225794999998243,"maxTime":0.23836899999992056,"minTime":0.10396600000012768},{"name":"headers","time":0.8037480999999957,"maxTime":0.9462419999999838,"minTime":0.7256529999999657},{"name":"horizontalRule","time":0.2186149999999884,"maxTime":0.27362700000003315,"minTime":0.19437100000004648},{"name":"images","time":0.12388539999997192,"maxTime":0.9019430000000739,"minTime":0.07081799999991745},{"name":"italicsAndBold","time":0.10089220000002115,"maxTime":0.15037400000005618,"minTime":0.08950099999992744},{"name":"lists","time":4.938929699999983,"maxTime":5.421000999999933,"minTime":4.623625999999831},{"name":"outdent","time":0.1648239000000217,"maxTime":0.3372110000000248,"minTime":0.1404290000000401},{"name":"paragraphs","time":3.4947812,"maxTime":4.554917999999816,"minTime":3.1714170000000195},{"name":"spanGamut","time":1.318997649999983,"maxTime":1.9916279999999915,"minTime":1.1469409999999698},{"name":"strikethrough","time":0.007458499999995638,"maxTime":0.14314200000012534,"minTime":0},{"name":"stripBlankLines","time":0.09447364999999763,"maxTime":0.1545929999999771,"minTime":0.0822689999999966},{"name":"stripLinkDefinitions","time":0.1762751000000094,"maxTime":0.3112949999999728,"minTime":0.1464570000000549},{"name":"tables","time":0.0023505499999828317,"maxTime":0.03947699999980614,"minTime":0},{"name":"unescapeSpecialChars","time":0.008332400000006146,"maxTime":0.03375200000004952,"minTime":0.0066299999998591375}]}],"1.6.0":[{"suiteName":"Basic","cycles":50,"tests":[{"name":"Simple \"Hello World\"","time":0.3075345600000001,"maxTime":5.369168,"minTime":0.1570040000000006},{"name":"readme.md","time":25.81825956,"maxTime":47.795452,"minTime":23.775378000000046}]},{"suiteName":"subParsers","cycles":20,"tests":[{"name":"hashHTMLBlocks","time":2.652987649999966,"maxTime":8.557761999999911,"minTime":1.8804290000000492},{"name":"anchors","time":0.5166509500000303,"maxTime":4.142066999999997,"minTime":0.27121600000009494},{"name":"autoLinks","time":0.0885518999999931,"maxTime":0.19437100000004648,"minTime":0.0705159999999978},{"name":"blockGamut","time":17.371581599999978,"maxTime":22.94093699999985,"minTime":14.081522999999834},{"name":"blockQuotes","time":3.011308699999995,"maxTime":4.110426000000189,"minTime":2.7742359999999735},{"name":"codeBlocks","time":0.24291900000000624,"maxTime":0.8344409999999698,"minTime":0.19346700000005512},{"name":"codeSpans","time":0.2271433000000002,"maxTime":0.4583549999999832,"minTime":0.19135800000003655},{"name":"detab","time":0.09469964999999547,"maxTime":0.13289599999984603,"minTime":0.08950099999992744},{"name":"encodeAmpsAndAngles","time":0.040486450000014426,"maxTime":0.07262600000012753,"minTime":0.03766799999993964},{"name":"encodeBackslashEscapes","time":0.09959649999997282,"maxTime":0.5095850000000155,"minTime":0.06840699999997923},{"name":"encodeCode","time":0.5320952499999863,"maxTime":0.7057630000001609,"minTime":0.4794489999999314},{"name":"escapeSpecialCharsWithinTagAttributes","time":0.38607564999999794,"maxTime":0.7018459999999322,"minTime":0.326663999999937},{"name":"githubCodeBlocks","time":0.21441115000002356,"maxTime":0.7780880000000252,"minTime":0.15579800000000432},{"name":"hashBlock","time":0.056638900000007195,"maxTime":0.27995499999997264,"minTime":0.035257999999885214},{"name":"hashElement","time":0.001958799999999883,"maxTime":0.033148999999866646,"minTime":0},{"name":"hashHTMLSpans","time":0.38414695000003574,"maxTime":1.9973540000000867,"minTime":0.2356569999999465},{"name":"hashPreCodeTags","time":0.1327451500000393,"maxTime":0.20009700000014163,"minTime":0.1157189999998991},{"name":"headers","time":0.9440720999999825,"maxTime":2.4683650000001762,"minTime":0.7823069999999461},{"name":"images","time":0.12035954999996648,"maxTime":0.4857769999998709,"minTime":0.08588499999996202},{"name":"italicsAndBold","time":0.11076150000000098,"maxTime":0.4447930000001179,"minTime":0.08799499999986438},{"name":"lists","time":5.782546349999995,"maxTime":13.248890999999958,"minTime":4.463608999999906},{"name":"outdent","time":0.3057505000000219,"maxTime":0.9561860000001161,"minTime":0.22541000000001077},{"name":"paragraphs","time":6.582542549999971,"maxTime":8.810596000000032,"minTime":4.498867000000246},{"name":"spanGamut","time":2.43690389999997,"maxTime":3.067450000000008,"minTime":1.6474849999999606},{"name":"strikethrough","time":0.005228549999992537,"maxTime":0.10035000000016225,"minTime":0},{"name":"stripBlankLines","time":0.12142940000005638,"maxTime":0.17508399999996982,"minTime":0.09191199999986566},{"name":"stripLinkDefinitions","time":0.24673084999997172,"maxTime":0.572566000000279,"minTime":0.17146900000034293},{"name":"tables","time":0.005650249999962398,"maxTime":0.0985419999997248,"minTime":0.00030099999958110857},{"name":"unescapeSpecialChars","time":0.016694800000050237,"maxTime":0.06569400000034875,"minTime":0.011450999999851774}]}]} \ No newline at end of file +{"1.7.2":[{"suiteName":"Basic","cycles":50,"tests":[{"name":"Simple \"Hello World\"","time":0.2924792600000001,"maxTime":5.779913000000079,"minTime":0.0870909999999867},{"name":"performance.testfile.md","time":30.395544379999997,"maxTime":53.85987,"minTime":26.054209000000128}]},{"suiteName":"subParsers","cycles":20,"tests":[{"name":"hashHTMLBlocks","time":4.303097000000003,"maxTime":7.7980609999999615,"minTime":2.377357999999731},{"name":"anchors","time":0.3474425999999994,"maxTime":0.6473019999998542,"minTime":0.28688599999986764},{"name":"autoLinks","time":0.08811514999999873,"maxTime":0.16544199999998455,"minTime":0.06328399999983958},{"name":"blockQuotes","time":2.1012153500000297,"maxTime":5.12055700000019,"minTime":1.7381930000001375},{"name":"codeBlocks","time":0.23850445000000492,"maxTime":0.8784390000000712,"minTime":0.18412599999965096},{"name":"codeSpans","time":0.2522458500000312,"maxTime":0.6283170000001519,"minTime":0.16031900000007226},{"name":"detab","time":0.09415714999997818,"maxTime":0.12867700000015247,"minTime":0.08769299999994473},{"name":"encodeAmpsAndAngles","time":0.1305904000000055,"maxTime":0.7331880000001547,"minTime":0.09251499999982116},{"name":"encodeBackslashEscapes","time":0.07973749999998744,"maxTime":0.1157189999998991,"minTime":0.07021500000018932},{"name":"encodeCode","time":0.9388443000000052,"maxTime":1.4799349999998412,"minTime":0.8573440000000119},{"name":"escapeSpecialCharsWithinTagAttributes","time":0.28453565000002073,"maxTime":0.4731209999999919,"minTime":0.24349200000006022},{"name":"githubCodeBlocks","time":0.2144414500000039,"maxTime":1.046893000000182,"minTime":0.13952599999993254},{"name":"hashBlock","time":0.06795475000005809,"maxTime":0.5532809999999699,"minTime":0.03616200000033132},{"name":"hashElement","time":0.0016724999999723877,"maxTime":0.029833999999937078,"minTime":0},{"name":"hashHTMLSpans","time":4.323498449999988,"maxTime":6.161724999999933,"minTime":4.0037499999998545},{"name":"hashPreCodeTags","time":0.1474811499999987,"maxTime":0.5584039999998822,"minTime":0.1087880000000041},{"name":"headers","time":1.1759319999999889,"maxTime":4.491336000000047,"minTime":0.8841640000000552},{"name":"horizontalRule","time":0.21614389999997458,"maxTime":0.2636819999997897,"minTime":0.19316600000001927},{"name":"images","time":0.15570804999995289,"maxTime":0.5587049999999181,"minTime":0.11782799999991767},{"name":"italicsAndBold","time":0.3219485000000077,"maxTime":1.012539999999717,"minTime":0.2365599999998267},{"name":"lists","time":2.753399100000024,"maxTime":5.612964000000375,"minTime":2.3276349999996455},{"name":"outdent","time":0.16286519999998744,"maxTime":0.2323420000002443,"minTime":0.1398269999999684},{"name":"paragraphs","time":5.108954950000021,"maxTime":6.168355000000247,"minTime":4.741155999999592},{"name":"spanGamut","time":4.422869150000042,"maxTime":6.14906800000017,"minTime":4.000737000000299},{"name":"strikethrough","time":0.0028779999999869687,"maxTime":0.051230000000032305,"minTime":0},{"name":"stripLinkDefinitions","time":0.1603637499999877,"maxTime":0.2257119999999304,"minTime":0.14193599999998696},{"name":"tables","time":0.002470999999968626,"maxTime":0.04339399999980742,"minTime":0},{"name":"unescapeSpecialChars","time":0.011074649999977737,"maxTime":0.04640800000015588,"minTime":0.006628999999975349}]}],"1.7.1":[{"suiteName":"Basic","cycles":50,"tests":[{"name":"Simple \"Hello World\"","time":1.0738219599999979,"maxTime":20.566299000000072,"minTime":0.3242529999999988},{"name":"performance.testfile.md","time":30.4629232,"maxTime":82.115725,"minTime":26.02165500000001}]},{"suiteName":"subParsers","cycles":20,"tests":[{"name":"hashHTMLBlocks","time":4.232850950000011,"maxTime":9.06222600000001,"minTime":2.35927700000002},{"name":"anchors","time":0.35050129999999624,"maxTime":0.7627189999998336,"minTime":0.28568100000029517},{"name":"autoLinks","time":0.08923019999999723,"maxTime":0.19015300000000934,"minTime":0.06509199999982229},{"name":"blockQuotes","time":2.073701349999965,"maxTime":4.988563999999769,"minTime":1.7291510000000017},{"name":"codeBlocks","time":0.2560277500000211,"maxTime":0.9369000000001506,"minTime":0.1790019999998549},{"name":"codeSpans","time":0.24160820000001876,"maxTime":0.8386599999998907,"minTime":0.1576060000002144},{"name":"detab","time":0.09915939999998499,"maxTime":0.16815399999995861,"minTime":0.08618599999999788},{"name":"encodeAmpsAndAngles","time":0.13123839999998382,"maxTime":0.646096999999827,"minTime":0.09311699999989287},{"name":"encodeBackslashEscapes","time":0.07607604999996057,"maxTime":0.1404299999999239,"minTime":0.07021399999985078},{"name":"encodeCode","time":0.9938553500000807,"maxTime":1.7056470000002264,"minTime":0.8648769999999786},{"name":"escapeSpecialCharsWithinTagAttributes","time":0.26711740000000644,"maxTime":0.37518199999976787,"minTime":0.24951800000008006},{"name":"githubCodeBlocks","time":0.19164420000001883,"maxTime":0.9664330000000518,"minTime":0.14012899999988804},{"name":"hashBlock","time":0.05914020000000164,"maxTime":0.39748199999985445,"minTime":0.03646299999991243},{"name":"hashElement","time":0.0017327499999964858,"maxTime":0.030737999999928434,"minTime":0},{"name":"hashHTMLSpans","time":4.116996499999937,"maxTime":5.5849379999999655,"minTime":3.89044100000001},{"name":"hashPreCodeTags","time":0.1423884499999531,"maxTime":0.5294739999999365,"minTime":0.1081850000000486},{"name":"headers","time":1.1452692999999954,"maxTime":4.103494999999839,"minTime":0.8639729999999872},{"name":"horizontalRule","time":0.21682209999996757,"maxTime":0.36583999999993466,"minTime":0.19407000000001062},{"name":"images","time":0.15055509999997413,"maxTime":0.5526780000000144,"minTime":0.11662299999989045},{"name":"italicsAndBold","time":0.3119285999999647,"maxTime":1.2412650000001122,"minTime":0.23625899999979083},{"name":"lists","time":4.022899600000005,"maxTime":7.077227000000221,"minTime":2.4975970000000416},{"name":"outdent","time":0.17451229999999213,"maxTime":0.26066899999977977,"minTime":0.14826499999981024},{"name":"paragraphs","time":6.5566433999999845,"maxTime":8.645457999999962,"minTime":4.997002000000066},{"name":"spanGamut","time":5.072655700000018,"maxTime":6.34705299999996,"minTime":4.136643999999706},{"name":"strikethrough","time":0.006192800000076204,"maxTime":0.11029400000006717,"minTime":0},{"name":"stripLinkDefinitions","time":0.16428144999997585,"maxTime":0.27694100000007893,"minTime":0.1416349999999511},{"name":"tables","time":0.004354600000010578,"maxTime":0.08015999999997803,"minTime":0},{"name":"unescapeSpecialChars","time":0.009130899999991015,"maxTime":0.04580600000008417,"minTime":0.006930999999894993}]}],"1.7.0":[{"suiteName":"Basic","cycles":50,"tests":[{"name":"Simple \"Hello World\"","time":0.39255787999999486,"maxTime":9.953321000000074,"minTime":0.09673299999997198},{"name":"performance.testfile.md","time":29.416470079999975,"maxTime":54.25341800000001,"minTime":25.948727999999846}]},{"suiteName":"subParsers","cycles":20,"tests":[{"name":"hashHTMLBlocks","time":4.0619999999999665,"maxTime":7.184810000000198,"minTime":2.325826999999663},{"name":"anchors","time":0.4883242500000051,"maxTime":4.085716999999931,"minTime":0.28085900000041875},{"name":"autoLinks","time":0.08583980000000793,"maxTime":0.19979499999999462,"minTime":0.06298299999980372},{"name":"blockQuotes","time":2.071019450000017,"maxTime":4.554016000000047,"minTime":1.7333710000002611},{"name":"codeBlocks","time":0.2531195000000025,"maxTime":0.8639729999999872,"minTime":0.17809799999986353},{"name":"codeSpans","time":0.2609549000000243,"maxTime":0.5924559999998564,"minTime":0.15971599999966202},{"name":"detab","time":0.09453374999998232,"maxTime":0.1298820000001797,"minTime":0.08859699999993609},{"name":"encodeAmpsAndAngles","time":0.10304694999997537,"maxTime":0.19196099999999205,"minTime":0.09462400000029447},{"name":"encodeBackslashEscapes","time":0.1064521499999728,"maxTime":0.5894419999999627,"minTime":0.07051600000022518},{"name":"encodeCode","time":0.9265486000000009,"maxTime":1.1821999999997388,"minTime":0.8347420000000056},{"name":"escapeSpecialCharsWithinTagAttributes","time":0.2759772000000112,"maxTime":0.6171669999998812,"minTime":0.24530000000004293},{"name":"githubCodeBlocks","time":0.1951549499999828,"maxTime":0.9799929999999222,"minTime":0.1386210000000574},{"name":"hashBlock","time":0.062304449999965074,"maxTime":0.4833670000002712,"minTime":0.03495699999984936},{"name":"hashElement","time":0.0014464500000030966,"maxTime":0.024711000000024796,"minTime":0},{"name":"hashHTMLSpans","time":4.1203715999999755,"maxTime":4.609765000000152,"minTime":3.8587989999996353},{"name":"hashPreCodeTags","time":0.14734550000000582,"maxTime":0.5351989999999205,"minTime":0.10487000000011903},{"name":"headers","time":1.3076671999999916,"maxTime":4.252966000000015,"minTime":0.8564390000001367},{"name":"horizontalRule","time":0.2203779999999597,"maxTime":0.3742779999997765,"minTime":0.19407000000001062},{"name":"images","time":0.15025354999997945,"maxTime":0.506872000000385,"minTime":0.1163219999998546},{"name":"italicsAndBold","time":0.30579589999997553,"maxTime":0.872110000000248,"minTime":0.24138200000015786},{"name":"lists","time":3.447394599999984,"maxTime":4.893336999999974,"minTime":2.407492000000275},{"name":"outdent","time":0.26698190000001887,"maxTime":0.8684939999998278,"minTime":0.1808109999997214},{"name":"paragraphs","time":5.866655149999997,"maxTime":8.331147999999757,"minTime":4.9695779999997285},{"name":"spanGamut","time":5.038527899999986,"maxTime":7.123635999999806,"minTime":4.11615299999994},{"name":"strikethrough","time":0.003992900000002919,"maxTime":0.07322800000019924,"minTime":0},{"name":"stripLinkDefinitions","time":0.15298084999997172,"maxTime":0.24288900000010472,"minTime":0.13952599999993254},{"name":"tables","time":0.0024410000000443686,"maxTime":0.043695999999727064,"minTime":0},{"name":"unescapeSpecialChars","time":0.008663700000033714,"maxTime":0.0406820000002881,"minTime":0.006628999999975349}]}],"1.6.4":[{"suiteName":"Basic","cycles":50,"tests":[{"name":"Simple \"Hello World\"","time":0.37575447999999595,"maxTime":6.3811059999999316,"minTime":0.182617999999934},{"name":"performance.testfile.md","time":33.83478732000001,"maxTime":61.04858100000001,"minTime":30.186325000000124}]},{"suiteName":"subParsers","cycles":20,"tests":[{"name":"hashHTMLBlocks","time":2.5643760500000328,"maxTime":8.346818999999869,"minTime":1.8710879999998724},{"name":"anchors","time":0.4985702000000174,"maxTime":4.221624999999676,"minTime":0.27031199999964883},{"name":"autoLinks","time":0.08000864999996793,"maxTime":0.17357799999990675,"minTime":0.06087299999990137},{"name":"blockQuotes","time":3.3429765499999804,"maxTime":7.305651000000125,"minTime":2.8504790000001776},{"name":"codeBlocks","time":0.22134235000003172,"maxTime":0.8220859999996719,"minTime":0.17176999999992404},{"name":"codeSpans","time":0.22901160000001256,"maxTime":0.7443360000002031,"minTime":0.15579799999977695},{"name":"detab","time":0.0973213499999929,"maxTime":0.15429100000028484,"minTime":0.08618699999988166},{"name":"encodeAmpsAndAngles","time":0.11678870000000643,"maxTime":0.19979600000033315,"minTime":0.09432200000037483},{"name":"encodeBackslashEscapes","time":0.08623155000002498,"maxTime":0.2296289999999317,"minTime":0.06810499999983222},{"name":"encodeCode","time":0.8853238499999861,"maxTime":1.1647219999999834,"minTime":0.8163599999998041},{"name":"escapeSpecialCharsWithinTagAttributes","time":0.2983526000000438,"maxTime":0.4954210000000785,"minTime":0.2401769999996759},{"name":"githubCodeBlocks","time":0.18343240000001515,"maxTime":0.7847170000000006,"minTime":0.1331980000004478},{"name":"hashBlock","time":0.0443587499999694,"maxTime":0.09763799999973344,"minTime":0.035257999999885214},{"name":"hashElement","time":0.00200395000001663,"maxTime":0.03345000000035725,"minTime":0},{"name":"hashHTMLSpans","time":4.199521549999963,"maxTime":4.551605000000109,"minTime":3.9874759999997877},{"name":"hashPreCodeTags","time":0.1295205500000293,"maxTime":0.3134050000003299,"minTime":0.10637700000006589},{"name":"headers","time":1.2236204000000044,"maxTime":4.009776000000329,"minTime":0.944735000000037},{"name":"horizontalRule","time":0.41190154999999323,"maxTime":4.175217999999859,"minTime":0.19648000000006505},{"name":"images","time":0.08806979999997111,"maxTime":0.20250800000030722,"minTime":0.0732279999997445},{"name":"italicsAndBold","time":0.2764291999999841,"maxTime":0.4137550000000374,"minTime":0.23324500000035187},{"name":"lists","time":5.0047764500000085,"maxTime":6.109288000000106,"minTime":4.663406000000123},{"name":"outdent","time":0.1521370000000161,"maxTime":0.3366089999999531,"minTime":0.13922500000035143},{"name":"paragraphs","time":5.336081549999994,"maxTime":7.117005000000063,"minTime":4.843312999999853},{"name":"spanGamut","time":4.449883849999901,"maxTime":6.152983999999833,"minTime":3.8569910000001073},{"name":"strikethrough","time":0.002606700000001183,"maxTime":0.04881900000009409,"minTime":0},{"name":"stripLinkDefinitions","time":0.18040370000001077,"maxTime":0.3161169999998492,"minTime":0.14705999999978303},{"name":"tables","time":0.0031190500000320754,"maxTime":0.05544899999995323,"minTime":0},{"name":"unescapeSpecialChars","time":0.009281650000002629,"maxTime":0.047313000000031025,"minTime":0.006628999999975349}]}],"1.6.3":[{"suiteName":"Basic","cycles":50,"tests":[{"name":"Simple \"Hello World\"","time":0.3880986600000119,"maxTime":6.064399999999978,"minTime":0.17418099999997594},{"name":"performance.testfile.md","time":26.898552680000012,"maxTime":49.06275100000005,"minTime":24.84523399999989}]},{"suiteName":"subParsers","cycles":20,"tests":[{"name":"hashHTMLBlocks","time":2.6158222500000194,"maxTime":8.18079200000011,"minTime":1.8985149999998612},{"name":"anchors","time":0.5154769000000442,"maxTime":4.690839000000324,"minTime":0.2639840000001641},{"name":"autoLinks","time":0.09307249999999385,"maxTime":0.18834400000014284,"minTime":0.07262600000012753},{"name":"blockQuotes","time":4.5183903999999755,"maxTime":8.952854000000116,"minTime":3.035816000000068},{"name":"codeBlocks","time":0.22262349999998604,"maxTime":0.347758999999769,"minTime":0.18834500000002663},{"name":"codeSpans","time":0.31763950000004115,"maxTime":1.0948100000000522,"minTime":0.1771950000002107},{"name":"detab","time":0.0919273999999632,"maxTime":0.13651200000003882,"minTime":0.08739199999990888},{"name":"encodeAmpsAndAngles","time":0.0438916999999492,"maxTime":0.08919999999989159,"minTime":0.038271000000349886},{"name":"encodeBackslashEscapes","time":0.10785369999998692,"maxTime":0.2651890000001913,"minTime":0.07835100000011153},{"name":"encodeCode","time":1.5346329500000138,"maxTime":9.895783999999821,"minTime":0.8645779999997103},{"name":"escapeSpecialCharsWithinTagAttributes","time":0.2937122499999759,"maxTime":0.5234480000003714,"minTime":0.25343700000030367},{"name":"githubCodeBlocks","time":0.20775164999997742,"maxTime":0.7901440000000548,"minTime":0.1416349999999511},{"name":"hashBlock","time":0.042234400000006646,"maxTime":0.12325299999974959,"minTime":0.035860999999840715},{"name":"hashElement","time":0.0016724999999951252,"maxTime":0.028929000000061933,"minTime":0},{"name":"hashHTMLSpans","time":0.4103353000000197,"maxTime":1.5980680000002394,"minTime":0.2404790000000503},{"name":"hashPreCodeTags","time":0.13196184999997057,"maxTime":0.3950719999998,"minTime":0.11029400000006717},{"name":"headers","time":1.0150126000000683,"maxTime":1.501936999999998,"minTime":0.8055130000002464},{"name":"horizontalRule","time":0.22018260000002102,"maxTime":0.35710100000005696,"minTime":0.1946739999998499},{"name":"images","time":0.1582398000000012,"maxTime":0.978186999999707,"minTime":0.07684500000004846},{"name":"italicsAndBold","time":0.28757974999998626,"maxTime":0.6394679999998516,"minTime":0.24078000000008615},{"name":"lists","time":5.151319100000023,"maxTime":6.331397000000379,"minTime":4.629061999999976},{"name":"outdent","time":0.18019314999994548,"maxTime":0.36342999999988024,"minTime":0.14253999999982625},{"name":"paragraphs","time":4.547636500000022,"maxTime":6.308794999999918,"minTime":4.002250999999887},{"name":"spanGamut","time":1.5190982500000245,"maxTime":1.863557999999557,"minTime":1.3720530000000508},{"name":"strikethrough","time":0.003450399999996989,"maxTime":0.06539299999985815,"minTime":0},{"name":"stripLinkDefinitions","time":0.1786111499999606,"maxTime":0.3128030000002582,"minTime":0.1443480000002637},{"name":"tables","time":0.0035106999999925392,"maxTime":0.06268099999988408,"minTime":0.00030099999958110857},{"name":"unescapeSpecialChars","time":0.01146649999998317,"maxTime":0.04881900000009409,"minTime":0.006628999999975349}]}],"1.6.2":[{"suiteName":"Basic","cycles":50,"tests":[{"name":"Simple \"Hello World\"","time":0.6130621400000001,"maxTime":5.893518999999998,"minTime":0.16875699999999938},{"name":"performance.testfile.md","time":25.970254839999992,"maxTime":62.88168,"minTime":23.709682999999927}]},{"suiteName":"subParsers","cycles":20,"tests":[{"name":"hashHTMLBlocks","time":2.6685977000000323,"maxTime":8.478507000000036,"minTime":1.8846490000000813},{"name":"anchors","time":0.5002727000000278,"maxTime":3.841318999999885,"minTime":0.2676000000001295},{"name":"autoLinks","time":0.09846654999997781,"maxTime":0.21064500000011321,"minTime":0.07202299999994466},{"name":"blockQuotes","time":3.221817550000014,"maxTime":5.825714999999946,"minTime":2.791112000000112},{"name":"codeBlocks","time":0.17663659999998343,"maxTime":0.3712639999998828,"minTime":0.1570040000001427},{"name":"codeSpans","time":0.2181328999999778,"maxTime":0.483066000000008,"minTime":0.15097700000001169},{"name":"detab","time":0.13492999999998573,"maxTime":0.6545340000000124,"minTime":0.08498099999997066},{"name":"encodeAmpsAndAngles","time":0.04158639999994875,"maxTime":0.11752699999988181,"minTime":0.03616199999987657},{"name":"encodeBackslashEscapes","time":0.0800689000000034,"maxTime":0.13319799999999304,"minTime":0.06780399999979636},{"name":"encodeCode","time":0.5599700499999927,"maxTime":0.9821019999999407,"minTime":0.48396900000011556},{"name":"escapeSpecialCharsWithinTagAttributes","time":0.35280645000001415,"maxTime":0.5683480000000145,"minTime":0.2914060000000518},{"name":"githubCodeBlocks","time":0.17996669999999995,"maxTime":0.7729650000001129,"minTime":0.1274710000000141},{"name":"hashBlock","time":0.057723849999990764,"maxTime":0.31159699999989243,"minTime":0.037368000000014945},{"name":"hashElement","time":0.0025463500000000748,"maxTime":0.04610600000000886,"minTime":0},{"name":"hashHTMLSpans","time":0.47458235000001425,"maxTime":2.325223000000051,"minTime":0.2344510000000355},{"name":"hashPreCodeTags","time":0.12186629999998785,"maxTime":0.3073779999999715,"minTime":0.10697999999979402},{"name":"headers","time":0.8577350000000024,"maxTime":0.9540770000000975,"minTime":0.7801970000000438},{"name":"horizontalRule","time":0.22663095000001476,"maxTime":0.41797300000007453,"minTime":0.1967819999999847},{"name":"images","time":0.17053435000000264,"maxTime":1.4528119999999944,"minTime":0.07714599999985694},{"name":"italicsAndBold","time":0.10093754999998054,"maxTime":0.20220699999981662,"minTime":0.0882960000001276},{"name":"lists","time":4.9306124000000064,"maxTime":5.460477999999966,"minTime":4.55642499999999},{"name":"outdent","time":0.16260889999998654,"maxTime":0.31461000000012973,"minTime":0.1416349999999511},{"name":"paragraphs","time":3.7896679000000177,"maxTime":5.563840999999911,"minTime":3.278396000000157},{"name":"spanGamut","time":1.4417527499999891,"maxTime":2.0124210000001312,"minTime":1.2032939999999144},{"name":"strikethrough","time":0.004233999999985372,"maxTime":0.08196800000018811,"minTime":0},{"name":"stripBlankLines","time":0.08623144999999113,"maxTime":0.1304850000001352,"minTime":0.0804600000001301},{"name":"stripLinkDefinitions","time":0.15983660000002828,"maxTime":0.21727400000008856,"minTime":0.1446480000001884},{"name":"tables","time":0.004143600000008974,"maxTime":0.07593999999994594,"minTime":0},{"name":"unescapeSpecialChars","time":0.00991439999999102,"maxTime":0.0581609999999273,"minTime":0.006628999999975349}]}],"1.6.1":[{"suiteName":"Basic","cycles":50,"tests":[{"name":"Simple \"Hello World\"","time":0.3172682400000001,"maxTime":5.4981469999999995,"minTime":0.16062000000000154},{"name":"readme.md","time":26.0144148,"maxTime":46.79858399999999,"minTime":24.245484999999917}]},{"suiteName":"subParsers","cycles":20,"tests":[{"name":"hashHTMLBlocks","time":2.6414157500000215,"maxTime":7.791727999999921,"minTime":1.9364810000001853},{"name":"anchors","time":0.47462755000000245,"maxTime":4.062812000000122,"minTime":0.25885999999991327},{"name":"autoLinks","time":0.08906409999998459,"maxTime":0.19708299999979317,"minTime":0.06870800000001509},{"name":"blockQuotes","time":3.213485000000014,"maxTime":6.05383699999993,"minTime":2.880010000000084},{"name":"codeBlocks","time":0.16200620000001892,"maxTime":0.2691060000001926,"minTime":0.15308599999980288},{"name":"codeSpans","time":0.169494799999984,"maxTime":0.39868699999988166,"minTime":0.1410319999999956},{"name":"detab","time":0.12471390000000611,"maxTime":0.6647800000000643,"minTime":0.08558400000015354},{"name":"encodeAmpsAndAngles","time":0.04181244999999763,"maxTime":0.08920000000011896,"minTime":0.03796999999985928},{"name":"encodeBackslashEscapes","time":0.07586505000000443,"maxTime":0.13289599999984603,"minTime":0.06810500000005959},{"name":"encodeCode","time":0.5765897500000051,"maxTime":0.970348999999942,"minTime":0.4791480000001229},{"name":"escapeSpecialCharsWithinTagAttributes","time":0.24603789999998754,"maxTime":0.35047099999997045,"minTime":0.22119199999997363},{"name":"githubCodeBlocks","time":0.1767573999999968,"maxTime":0.815454999999929,"minTime":0.1250600000000759},{"name":"hashBlock","time":0.06537804999999253,"maxTime":0.42972599999984595,"minTime":0.0376690000000508},{"name":"hashElement","time":0.0020039500000052614,"maxTime":0.034051999999974214,"minTime":0},{"name":"hashHTMLSpans","time":0.42437735000000887,"maxTime":2.3210050000000138,"minTime":0.24078000000008615},{"name":"hashPreCodeTags","time":0.12225794999998243,"maxTime":0.23836899999992056,"minTime":0.10396600000012768},{"name":"headers","time":0.8037480999999957,"maxTime":0.9462419999999838,"minTime":0.7256529999999657},{"name":"horizontalRule","time":0.2186149999999884,"maxTime":0.27362700000003315,"minTime":0.19437100000004648},{"name":"images","time":0.12388539999997192,"maxTime":0.9019430000000739,"minTime":0.07081799999991745},{"name":"italicsAndBold","time":0.10089220000002115,"maxTime":0.15037400000005618,"minTime":0.08950099999992744},{"name":"lists","time":4.938929699999983,"maxTime":5.421000999999933,"minTime":4.623625999999831},{"name":"outdent","time":0.1648239000000217,"maxTime":0.3372110000000248,"minTime":0.1404290000000401},{"name":"paragraphs","time":3.4947812,"maxTime":4.554917999999816,"minTime":3.1714170000000195},{"name":"spanGamut","time":1.318997649999983,"maxTime":1.9916279999999915,"minTime":1.1469409999999698},{"name":"strikethrough","time":0.007458499999995638,"maxTime":0.14314200000012534,"minTime":0},{"name":"stripBlankLines","time":0.09447364999999763,"maxTime":0.1545929999999771,"minTime":0.0822689999999966},{"name":"stripLinkDefinitions","time":0.1762751000000094,"maxTime":0.3112949999999728,"minTime":0.1464570000000549},{"name":"tables","time":0.0023505499999828317,"maxTime":0.03947699999980614,"minTime":0},{"name":"unescapeSpecialChars","time":0.008332400000006146,"maxTime":0.03375200000004952,"minTime":0.0066299999998591375}]}],"1.6.0":[{"suiteName":"Basic","cycles":50,"tests":[{"name":"Simple \"Hello World\"","time":0.3075345600000001,"maxTime":5.369168,"minTime":0.1570040000000006},{"name":"readme.md","time":25.81825956,"maxTime":47.795452,"minTime":23.775378000000046}]},{"suiteName":"subParsers","cycles":20,"tests":[{"name":"hashHTMLBlocks","time":2.652987649999966,"maxTime":8.557761999999911,"minTime":1.8804290000000492},{"name":"anchors","time":0.5166509500000303,"maxTime":4.142066999999997,"minTime":0.27121600000009494},{"name":"autoLinks","time":0.0885518999999931,"maxTime":0.19437100000004648,"minTime":0.0705159999999978},{"name":"blockGamut","time":17.371581599999978,"maxTime":22.94093699999985,"minTime":14.081522999999834},{"name":"blockQuotes","time":3.011308699999995,"maxTime":4.110426000000189,"minTime":2.7742359999999735},{"name":"codeBlocks","time":0.24291900000000624,"maxTime":0.8344409999999698,"minTime":0.19346700000005512},{"name":"codeSpans","time":0.2271433000000002,"maxTime":0.4583549999999832,"minTime":0.19135800000003655},{"name":"detab","time":0.09469964999999547,"maxTime":0.13289599999984603,"minTime":0.08950099999992744},{"name":"encodeAmpsAndAngles","time":0.040486450000014426,"maxTime":0.07262600000012753,"minTime":0.03766799999993964},{"name":"encodeBackslashEscapes","time":0.09959649999997282,"maxTime":0.5095850000000155,"minTime":0.06840699999997923},{"name":"encodeCode","time":0.5320952499999863,"maxTime":0.7057630000001609,"minTime":0.4794489999999314},{"name":"escapeSpecialCharsWithinTagAttributes","time":0.38607564999999794,"maxTime":0.7018459999999322,"minTime":0.326663999999937},{"name":"githubCodeBlocks","time":0.21441115000002356,"maxTime":0.7780880000000252,"minTime":0.15579800000000432},{"name":"hashBlock","time":0.056638900000007195,"maxTime":0.27995499999997264,"minTime":0.035257999999885214},{"name":"hashElement","time":0.001958799999999883,"maxTime":0.033148999999866646,"minTime":0},{"name":"hashHTMLSpans","time":0.38414695000003574,"maxTime":1.9973540000000867,"minTime":0.2356569999999465},{"name":"hashPreCodeTags","time":0.1327451500000393,"maxTime":0.20009700000014163,"minTime":0.1157189999998991},{"name":"headers","time":0.9440720999999825,"maxTime":2.4683650000001762,"minTime":0.7823069999999461},{"name":"images","time":0.12035954999996648,"maxTime":0.4857769999998709,"minTime":0.08588499999996202},{"name":"italicsAndBold","time":0.11076150000000098,"maxTime":0.4447930000001179,"minTime":0.08799499999986438},{"name":"lists","time":5.782546349999995,"maxTime":13.248890999999958,"minTime":4.463608999999906},{"name":"outdent","time":0.3057505000000219,"maxTime":0.9561860000001161,"minTime":0.22541000000001077},{"name":"paragraphs","time":6.582542549999971,"maxTime":8.810596000000032,"minTime":4.498867000000246},{"name":"spanGamut","time":2.43690389999997,"maxTime":3.067450000000008,"minTime":1.6474849999999606},{"name":"strikethrough","time":0.005228549999992537,"maxTime":0.10035000000016225,"minTime":0},{"name":"stripBlankLines","time":0.12142940000005638,"maxTime":0.17508399999996982,"minTime":0.09191199999986566},{"name":"stripLinkDefinitions","time":0.24673084999997172,"maxTime":0.572566000000279,"minTime":0.17146900000034293},{"name":"tables","time":0.005650249999962398,"maxTime":0.0985419999997248,"minTime":0.00030099999958110857},{"name":"unescapeSpecialChars","time":0.016694800000050237,"maxTime":0.06569400000034875,"minTime":0.011450999999851774}]}]} \ No newline at end of file diff --git a/performance.log.md b/performance.log.md index ed44990..304398b 100644 --- a/performance.log.md +++ b/performance.log.md @@ -1,6 +1,47 @@ # Performance Tests for showdown +## [version 1.7.2](https://github.com/showdownjs/showdown/tree/1.7.2) + +### Test Suite: Basic (50 cycles) +| test | avgTime | max | min | +|:-----|--------:|----:|----:| +|Simple "Hello World"|0.292|5.780|0.087| +|performance.testfile.md|30.396|53.860|26.054| + +### Test Suite: subParsers (20 cycles) +| test | avgTime | max | min | +|:-----|--------:|----:|----:| +|hashHTMLBlocks|4.303|7.798|2.377| +|anchors|0.347|0.647|0.287| +|autoLinks|0.088|0.165|0.063| +|blockQuotes|2.101|5.121|1.738| +|codeBlocks|0.239|0.878|0.184| +|codeSpans|0.252|0.628|0.160| +|detab|0.094|0.129|0.088| +|encodeAmpsAndAngles|0.131|0.733|0.093| +|encodeBackslashEscapes|0.080|0.116|0.070| +|encodeCode|0.939|1.480|0.857| +|escapeSpecialCharsWithinTagAttributes|0.285|0.473|0.243| +|githubCodeBlocks|0.214|1.047|0.140| +|hashBlock|0.068|0.553|0.036| +|hashElement|0.002|0.030|0.000| +|hashHTMLSpans|4.323|6.162|4.004| +|hashPreCodeTags|0.147|0.558|0.109| +|headers|1.176|4.491|0.884| +|horizontalRule|0.216|0.264|0.193| +|images|0.156|0.559|0.118| +|italicsAndBold|0.322|1.013|0.237| +|lists|2.753|5.613|2.328| +|outdent|0.163|0.232|0.140| +|paragraphs|5.109|6.168|4.741| +|spanGamut|4.423|6.149|4.001| +|strikethrough|0.003|0.051|0.000| +|stripLinkDefinitions|0.160|0.226|0.142| +|tables|0.002|0.043|0.000| +|unescapeSpecialChars|0.011|0.046|0.007| + + ## [version 1.7.1](https://github.com/showdownjs/showdown/tree/1.7.1) ### Test Suite: Basic (50 cycles) From dc20acb615df432c13969431dc2a4dc2d2d91f5e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Estev=C3=A3o=20Soares=20dos=20Santos?= Date: Sat, 5 Aug 2017 01:50:02 +0100 Subject: [PATCH 6/7] chore(package): update semver to version 5.4.1 (#416) --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 159352a..56b1c85 100644 --- a/package.json +++ b/package.json @@ -53,7 +53,7 @@ "load-grunt-tasks": "^3.2.0", "performance-now": "^2.0.0", "quiet-grunt": "^0.2.3", - "semver": "^5.0.0", + "semver": "^5.4.1", "semver-sort": "0.0.4", "sinon": "^2.3.3", "source-map-support": "^0.4.15" From 7332582db34c78142d37c3205740f132b1a66177 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Estev=C3=A3o=20Soares=20dos=20Santos?= Date: Sat, 5 Aug 2017 01:51:09 +0100 Subject: [PATCH 7/7] chore(package): update sinon to version 2.4.0 (#417) Closes #402 --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 56b1c85..959c8dc 100644 --- a/package.json +++ b/package.json @@ -55,7 +55,7 @@ "quiet-grunt": "^0.2.3", "semver": "^5.4.1", "semver-sort": "0.0.4", - "sinon": "^2.3.3", + "sinon": "^2.4.0", "source-map-support": "^0.4.15" }, "dependencies": {