From 6626f3b640736ce08c00a9c1e50db36992a257a0 Mon Sep 17 00:00:00 2001 From: Christopher Jeffrey Date: Tue, 4 Oct 2011 19:41:12 -0500 Subject: [PATCH 1/2] multiline tags --- lib/marked.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/lib/marked.js b/lib/marked.js index 92b9a154..353e601b 100644 --- a/lib/marked.js +++ b/lib/marked.js @@ -17,7 +17,7 @@ var block = { lheading: /^([^\n]+)\n *(=|-){3,}/, blockquote: /^ *>[^\n]*(?:\n *>[^\n]*)*/, list: /^( *)([*+-]|\d+\.) [^\0]+?(?:\n{2,}(?! )|\s*$)(?!\1\2|\1\d+\.)/, - html: /^ *(?:|<(\w+)[^\0]+?<\/\1>|<[^<>\n]+>) *(?:\n{2,}|\s*$)/, + html: /^ *(?:|<(\w+)[^\0]+?<\/\1>|<\/?\w+[^>]*>) *(?:\n{2,}|\s*$)/, text: /^[^\n]+/ }; @@ -181,7 +181,7 @@ block.token = function(str, tokens) { var inline = { escape: /^\\([\\`*{}\[\]()#+\-.!_])/, autolink: /^<([^ >]+(@|:\/)[^ >]+)>/, - tag: /^|^<[^\n>]+>/, + tag: /^|^<\/?\w+[^>]*>/, link: /^!?\[((?:\[[^\]]*\]|[^\[\]])*)\]\s*\(([^\)]*)\)/, reflink: /^!?\[((?:\[[^\]]*\]|[^\[\]])*)\]\s*\[([^\]]*)\]/, nolink: /^!?\[((?:\[[^\]]*\]|[^\[\]])*)\]/, From 61117f12b45d0446a174ef1e9b5e17fb6ec5128f Mon Sep 17 00:00:00 2001 From: Christopher Jeffrey Date: Tue, 4 Oct 2011 20:46:35 -0500 Subject: [PATCH 2/2] dont look for close tag in block rule --- lib/marked.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/marked.js b/lib/marked.js index 353e601b..5767d598 100644 --- a/lib/marked.js +++ b/lib/marked.js @@ -17,7 +17,7 @@ var block = { lheading: /^([^\n]+)\n *(=|-){3,}/, blockquote: /^ *>[^\n]*(?:\n *>[^\n]*)*/, list: /^( *)([*+-]|\d+\.) [^\0]+?(?:\n{2,}(?! )|\s*$)(?!\1\2|\1\d+\.)/, - html: /^ *(?:|<(\w+)[^\0]+?<\/\1>|<\/?\w+[^>]*>) *(?:\n{2,}|\s*$)/, + html: /^ *(?:|<(\w+)[^\0]+?<\/\1>|<\w+[^>]*>) *(?:\n{2,}|\s*$)/, text: /^[^\n]+/ };