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 fd063a4..3483b0c 100644 Binary files a/dist/showdown.js and b/dist/showdown.js differ diff --git a/dist/showdown.js.map b/dist/showdown.js.map index 213e449..c0b71d0 100644 Binary files a/dist/showdown.js.map and b/dist/showdown.js.map differ diff --git a/dist/showdown.min.js b/dist/showdown.min.js index 88e9000..58fbcc7 100644 Binary files a/dist/showdown.min.js and b/dist/showdown.min.js differ diff --git a/dist/showdown.min.js.map b/dist/showdown.min.js.map index 3b8a1ef..183ad97 100644 Binary files a/dist/showdown.min.js.map and b/dist/showdown.min.js.map differ 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 {