From 5155a8ee205cf52e564ebb8b908acad39928d21b Mon Sep 17 00:00:00 2001 From: Jeff Parsons Date: Mon, 21 Mar 2016 15:59:32 -0700 Subject: [PATCH] Fix misdetection of emphasis inside links --- modules/markout/lib/markout.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/modules/markout/lib/markout.js b/modules/markout/lib/markout.js index 3cb26e256..9f4be6e4e 100644 --- a/modules/markout/lib/markout.js +++ b/modules/markout/lib/markout.js @@ -1275,8 +1275,8 @@ MarkOut.prototype.convertMDEmphasis = function(sBlock) * *[modules](/modules/)* */ if (sBlock.indexOf('*') >= 0 || sBlock.indexOf('_') >= 0) { - sBlock = sBlock.replace(/(^|[^a-z0-9])([\*_])\2([\s\S]*?)\2\2([^a-z0-9]|$)/gi, "$1$3$4"); - sBlock = sBlock.replace(/(^|[^a-z0-9])([\*_])([\s\S]*?)\2([^a-z0-9]|$)/gi, "$1$3$4"); + sBlock = sBlock.replace(/(^|[^a-z0-9-])([\*_])\2([\s\S]*?)\2\2([^a-z0-9-]|$)/gi, "$1$3$4"); + sBlock = sBlock.replace(/(^|[^a-z0-9-])([\*_])([\s\S]*?)\2([^a-z0-9-]|$)/gi, "$1$3$4"); } return sBlock; };