From 5a58fc41c2ab1c3995ff8c63f7226254bec0ff10 Mon Sep 17 00:00:00 2001 From: Reed Garmsen Date: Tue, 11 Aug 2015 22:51:47 -0700 Subject: Minor change to bold and italic parsing to be more similar to code parsing --- web/static/js/marked/lib/marked.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/web/static/js/marked/lib/marked.js b/web/static/js/marked/lib/marked.js index 4085649a5..7f2438069 100644 --- a/web/static/js/marked/lib/marked.js +++ b/web/static/js/marked/lib/marked.js @@ -226,8 +226,8 @@ var inline = { link: /^!?\[(inside)\]\(href\)/, reflink: /^!?\[(inside)\]\s*\[([^\]]*)\]/, nolink: /^!?\[((?:\[[^\]]*\]|[^\[\]])*)\]/, - strong: /^\*((?:\*\*|[\s\S])+?)\*/, - em: /^\b_((?:[^_]|__)+?)_\b/, + strong: /^(\*{1})\s*([^\r?\n|\r]*?[^\*])\s*\1(?!\*)/, + em: /^(_{1})\s*([^\r?\n|\r]*?[^_])\s*\1(?!_)/, code: /^(`{1})\s*([^\r?\n|\r]*?[^`])\s*\1(?!`)/, br: /^ {2,}\n(?!\s*$)/, del: noop, -- cgit v1.2.3-1-g7c22