From a8427c9423dd93ca7ce10161ff67d3b191389f5e Mon Sep 17 00:00:00 2001 From: Estevao Soares dos Santos Date: Sun, 10 Dec 2017 04:49:24 +0000 Subject: [PATCH] feat(completeHTMLOutput): add option to output a complete HTML document --- dist/showdown.js | Bin 167671 -> 168544 bytes dist/showdown.js.map | Bin 416270 -> 418747 bytes dist/showdown.min.js | Bin 96432 -> 96927 bytes dist/showdown.min.js.map | Bin 73664 -> 74030 bytes src/converter.js | 3 +++ src/options.js | 5 +++++ src/subParsers/completeHTMLOutput.js | 17 +++++++++++++++++ test/features/completeHTMLOutput/simple.html | 14 ++++++++++++++ test/features/completeHTMLOutput/simple.md | 7 +++++++ test/node/testsuite.features.js | 13 ++++++++++++- 10 files changed, 58 insertions(+), 1 deletion(-) create mode 100644 src/subParsers/completeHTMLOutput.js create mode 100644 test/features/completeHTMLOutput/simple.html create mode 100644 test/features/completeHTMLOutput/simple.md diff --git a/dist/showdown.js b/dist/showdown.js index 1e9fb75201100c39f860e19385c4d01bd2a30ac9..bb806080153459d83ff3bc0234deefcd226ccb3a 100644 GIT binary patch delta 458 zcmex9m+Qe2t_c!Mh6Wp@jtftg=VB8~&d)8#Ni9kB2=VptFD)r3ogBbt5&&kE6e}bu zz~mJ&N^)})Qu32ab5rw5bQCi4l5&^~8A#`*mHhPn*%=E-4CcEty Jt}v?a0ssOfq>%ss delta 36 ucmV+<0NelIqzd<)3Xm8AFgdXr#}k8^6t|ib0W*iUaGU|XIk!640VcW;CJvea diff --git a/dist/showdown.js.map b/dist/showdown.js.map index 2697701878525e1757d1f3ab785b225f97cf5e54..52d42695ad773777dcdd3d8a67e75b06e874d604 100644 GIT binary patch delta 969 zcmZ`%T}V@580LJR-&)7)sEy@>?DHq*@@Mm+=tphSnh}aK%@8K+=#Dzw&enEDKZ1!u z2AN7<_(l*ILeP!O43=2n=pyOL>Y|%26e6L5^xmX%HbxM3_dMVGzR&x<&-+cjG%dd~ z#hhGjPcRVjONw-{y}79+s)V8n+u-sRo!pmV<}wOwIQs%~PbRycG*<>NO9;%WAIOg2-aa zu?dXBP3PGMTRw!IBLiET=b8OFKSnKaYT=gN!pbA9+fn{+>srRMwTC>L?dDT8w*3V& z3n)W(*5POfIl=LRtI`eDI~;@c@U#k5!>$GEVfD1yv}yqJGoy%yl}4Nq-~P$v8n9J# zLe6LOBtFNX+pR!3G?uQuHi25W6OfodRuD$83A)PAopf;9gY94|M_KTDNF8z3sj9AX zgtg2O2;Ng)Vpn;fo7^GrNGKERF+^Z9p$;)JshXoXl+F-fb_xlMJ`>=6E;@7v?ju=NU8g760GU8&PYs7TWvg7zx`KlKKCq5(-(DyUEH@khNrxsQ5k zv{0R=LPL`1t@BV(_Nt^i=)I{DMeK`!xP<9=M*_z?5*e$Ho5PaqmBRm(SJfkmDn*06 zYEDQDD?ZUreZ5ramuN7g_<}O^MW`f;-G0dnJDsF(uYEQ;$q}&KB^hy(o0QamwU0Dq zrx!~9a9AHD=U~1~m$jF~u0uy*C`wB9sI%%yHTBGXbIJj?TTU6Efq|agD^IzL>a>tG>5_($4ynLQ%c&yWP^y%$FHmMtnK_x5j;ke_#W3=TROI}-KorDc MT|>O)5&4+-1DS_XA^-pY delta 172 zcmV;d08{_F#~F^a8L&nHvv2|2BeQuXxdQ`eOhlKVKmsI_z!(abkb(mgmyo{!3YTCs z0uz(K76g;+1s8*_Dz~pH0fEDpPjCYYli*|ulkiCdw@~i^5)=b9VMdqntOF#M@T&q8 zmmvEA1ebvO0S1>Z6axyE5Rn28x4;7e!BLZ-S_+fE848o&w+ffQ<^c|eZ&?DjZ&?Ef aZih9<1GhEE1jw4VqhkdhJh$qh1<}DF4nqb2 diff --git a/dist/showdown.min.js b/dist/showdown.min.js index 8b0db7268f1798acd65151e61a5b419b57ce0b5a..bf11a0d8cb326051813b571fabff34030b70533f 100644 GIT binary patch delta 388 zcmdn+k#+u8)(PTFh6WoY75RmAlJj#5a#BlDJwkka{7Xv;N=qhx;FS-6FpCuu6<`V! zGD>oD6jJh&OLJ56N^}%5^OAE)Q!?|?6%uSfQg#VCAXaK(id}+2VqOZ6la!xQ3FMR{ zrWZGB@^9DVXS~6znQrT;S6rGDkXTflTBM-_Gag~TlBPzwPQH%g_WweRlHx*`3Z@&D zGHPHGmsezzuE$ibmz0{8UzDn(ldj{ay+ArQwFKzZ43MKrY?VSo z+;lCJ?119>U=INqV86uVscWa}l@w*>YG`UJfuy0rKy{!X09rA9vI3(7Hpi_kV^rKO Jp~X1E4*+g;h1>uD delta 36 scmbRLm36~M)(PTF29_Ho75SUb@^3%O&v=}9`+i|Yaq;c!I*c>?004Xpk^lez diff --git a/dist/showdown.min.js.map b/dist/showdown.min.js.map index b4e6a8d163a481060c33158f778903b9e25c1e96..2cf99027dd446d00586ec5aefcac1850dba9231a 100644 GIT binary patch delta 5210 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 delta 5033 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 YWF5)P9&91ElbRV-IJ~6WH;^y?4Rgl&?EnA( diff --git a/src/converter.js b/src/converter.js index eacf003..8325fda 100644 --- a/src/converter.js +++ b/src/converter.js @@ -314,6 +314,9 @@ showdown.Converter = function (converterOptions) { // attacklab: Restore tremas text = text.replace(/¨T/g, '¨'); + // render a complete html document instead of a partial if the option is enabled + text = showdown.subParser('completeHTMLOutput')(text, options, globals); + // Run output modifiers showdown.helper.forEach(outputModifiers, function (ext) { text = showdown.subParser('runExtension')(ext, text, options, globals); diff --git a/src/options.js b/src/options.js index fc4df19..c743c45 100644 --- a/src/options.js +++ b/src/options.js @@ -150,6 +150,11 @@ function getDefaultOpts (simple) { defaultValue: false, description: 'Enable support for underline. Syntax is double or triple underscores: `__underline word__`. With this option enabled, underscores no longer parses into `` and ``', type: 'boolean' + }, + completeHTMLOutput: { + defaultValue: false, + description: 'Outputs a complete html document, including ``, `` and `` tags', + type: 'boolean' } }; if (simple === false) { diff --git a/src/subParsers/completeHTMLOutput.js b/src/subParsers/completeHTMLOutput.js new file mode 100644 index 0000000..7b8c722 --- /dev/null +++ b/src/subParsers/completeHTMLOutput.js @@ -0,0 +1,17 @@ +/** + * Turn Markdown link shortcuts into XHTML tags. + */ +showdown.subParser('completeHTMLOutput', function (text, options, globals) { + 'use strict'; + + if (!options.completeHTMLOutput) { + return text; + } + + text = globals.converter._dispatch('completeHTMLOutput.before', text, options, globals); + + text = '\n\n\n\n\n' + text.trim() + '\n\n'; + + text = globals.converter._dispatch('completeHTMLOutput.after', text, options, globals); + return text; +}); diff --git a/test/features/completeHTMLOutput/simple.html b/test/features/completeHTMLOutput/simple.html new file mode 100644 index 0000000..62aa62a --- /dev/null +++ b/test/features/completeHTMLOutput/simple.html @@ -0,0 +1,14 @@ + + + + + +

This is a markdown file

+

Converted into a full HTML document

+
    +
  • this
    • +
  • is
    • +
  • awesome
    • +
+ + diff --git a/test/features/completeHTMLOutput/simple.md b/test/features/completeHTMLOutput/simple.md new file mode 100644 index 0000000..e35ed26 --- /dev/null +++ b/test/features/completeHTMLOutput/simple.md @@ -0,0 +1,7 @@ +This is a **markdown** file + +Converted into a full HTML document + + - this + - is + - awesome diff --git a/test/node/testsuite.features.js b/test/node/testsuite.features.js index a0d0194..a7ee7e8 100644 --- a/test/node/testsuite.features.js +++ b/test/node/testsuite.features.js @@ -14,7 +14,8 @@ var bootstrap = require('../bootstrap.js'), emojisSuite = bootstrap.getTestSuite('test/features/emojis/'), underlineSuite = bootstrap.getTestSuite('test/features/underline/'), literalMidWordUnderscoresSuite = bootstrap.getTestSuite('test/features/literalMidWordUnderscores/'), - literalMidWordAsterisksSuite = bootstrap.getTestSuite('test/features/literalMidWordAsterisks/'); + literalMidWordAsterisksSuite = bootstrap.getTestSuite('test/features/literalMidWordAsterisks/'), + completeHTMLOutputSuite = bootstrap.getTestSuite('test/features/completeHTMLOutput/'); describe('makeHtml() features testsuite', function () { 'use strict'; @@ -231,4 +232,14 @@ describe('makeHtml() features testsuite', function () { it(suite[i].name.replace(/-/g, ' '), assertion(suite[i], converter)); } }); + + /** test completeHTMLOutput option **/ + describe('completeHTMLOutput option', function () { + var converter, + suite = completeHTMLOutputSuite; + for (var i = 0; i < suite.length; ++i) { + converter = new showdown.Converter({completeHTMLOutput: true}); + it(suite[i].name.replace(/-/g, ' '), assertion(suite[i], converter)); + } + }); });