From d9cd39abd0b86e62b795d418e78667b6c32d5afe Mon Sep 17 00:00:00 2001 From: Christopher Jeffrey Date: Sun, 21 Aug 2011 08:16:22 -0500 Subject: [PATCH] fix hr --- lib/marked.js | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/lib/marked.js b/lib/marked.js index 4a07d310..94af84cd 100644 --- a/lib/marked.js +++ b/lib/marked.js @@ -12,9 +12,9 @@ var block = { newline: /^\n+/, block: /^ {4,}[^\n]*(?:\n {4,}[^\n]*)*/, + hr: /^( *[\-*_]){3,}/, heading: /^ *(#{1,6}) *([^\n#]*) *#*/, lheading: /^([^\n]+)\n *(=|-){3,}/, - hr: /^( ?[\-*_]){3,}/, blockquote: /^ *>[^\n]*(?:\n *>[^\n]*)*/, //list: /^(?:( *)(\*|\+|-|\d+\.)[^\n]+(?:\n[^\n]+)*(?:\n{1,2}|$)){2,}/, //list: /^(?:( *)(\*|\+|-|\d+\.)[^\n]+(?:\n[^\n]*)*){2,}(?:\n\n\1?(?!\*|\+|-|\d\.)|$)/, @@ -159,8 +159,8 @@ block.token = function(str, tokens) { type: 'list_start', ordered: isFinite(cap[2]) }); - //loose = /\n *\n *(?:\*|\+|-|\d+\.)/.test(cap[0]); - loose = false; // /\n *\n(?! *$)/.test(cap[0]); + loose = /\n *\n *(?:\*|\+|-|\d+\.)/.test(cap[0]); + //loose = false; // /\n *\n(?! *$)/.test(cap[0]); //loose = '\n *\n' + cap[1] // + '(?:\\*|\\+|-|\\d+\\.)'; //loose = new RegExp(loose).test(cap[0]);