codewalker/marked
1
0
Fork 0
Code Pull Requests Actions Packages Releases Activity

allow differing bullets in lists. closes #16.

Browse Source
This commit is contained in:
Christopher Jeffrey 2012-01-09 08:11:34 -06:00
parent f42020b896
commit 62b278ac67
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
lib/marked.js
View File

@ -17,7 +17,7 @@ var block = {
heading: /^ *(#{1,6}) *([^\0]+?) *#* *\n+/, heading: /^ *(#{1,6}) *([^\0]+?) *#* *\n+/,
lheading: /^([^\n]+)\n *(=|-){3,}/, lheading: /^([^\n]+)\n *(=|-){3,}/,
blockquote: /^(^ *> ?[^\n]+\n([^\n]+\n)*\n*)+/, blockquote: /^(^ *> ?[^\n]+\n([^\n]+\n)*\n*)+/,
list: /^( *)([*+-]|\d+\.) [^\0]+?(?:\n{2,}(?! )|\s*$)(?!\1\2|\1\d+\.)/, list: /^( *)([*+-]|\d+\.) [^\0]+?(?:\n{2,}(?! )|\s*$)(?!\1(?:[*+-](?! *\* *\*)|\d+\.))/,
html: /^ *(?:comment|closed|closing) *(?:\n{2,}|\s*$)/, html: /^ *(?:comment|closed|closing) *(?:\n{2,}|\s*$)/,
paragraph: /^([^\n]+\n?(?!body))+\n*/, paragraph: /^([^\n]+\n?(?!body))+\n*/,
text: /^[^\n]+/ text: /^[^\n]+/
@ -202,7 +202,7 @@ block.token = function(str, tokens, top) {
// Get each top-level item. // Get each top-level item.
cap = cap[0].match( cap = cap[0].match(
/^( *)([*+-]|\d+\.)[^\n]*(?:\n(?!\1\2|\1\d+\.)[^\n]*)*/gm /^( *)([*+-]|\d+\.)[^\n]*(?:\n(?!\1(?:[*+-]|\d+\.))[^\n]*)*/gm
); );
i = 0; i = 0;