X-Git-Url: http://git.bytex64.net/?a=blobdiff_plain;f=www%2Fjssrc%2Fblerg%2FUtil.js;h=51489c9e0a2a94928e9fafe06110a16676d5b02d;hb=e01bce7710b1b70b003a2cccc8483fcda3d72014;hp=78081ed7e2fedfda34fb52ce90c40166a15bf84e;hpb=f52a8f9713f3695944257d179b7c418ee60062c7;p=blerg.git

diff --git a/www/jssrc/blerg/Util.js b/www/jssrc/blerg/Util.js
index 78081ed..51489c9 100644
--- a/www/jssrc/blerg/Util.js
+++ b/www/jssrc/blerg/Util.js
@@ -16,7 +16,7 @@ blerg.Util.formatLinkHooks = [
 ];
 
 blerg.Util.formatMarkdownLinks = function(l) {
-        m = l.match(/(\s|^)\[([^\]]+)\]\((https?:\/\/[a-zA-Z0-9.-]*[a-zA-Z0-9](\/[^)"]*?)?)(\s([^)]*))?\)/);
+        m = l.match(/(\s[()\[\]{}]?|^)\[([^\]]+)\]\((https?:\/\/[a-zA-Z0-9.-]*[a-zA-Z0-9](\/[^)"]*?)?)(\s([^)]*))?\)/);
         if (!m)
             return l;
         var whitespace = m[1];
@@ -72,7 +72,7 @@ blerg.Util.blergFormat = function(text) {
         l = l.replace(/&/g, '&amp;').replace(/</g, '&lt;').replace(/>/g, '&gt;');
 
         // Turn HTTP URLs into links
-        l = l.replace(/(\s|^)(https?:\/\/[a-zA-Z0-9.-]*[a-zA-Z0-9](\/([^\s"]*[^.!,;?()\s])?)?)/g, '$1<a href="$2">$2</a>');
+        l = l.replace(/(\s[()\[\]{}]?|^)(https?:\/\/[a-zA-Z0-9.-]*[a-zA-Z0-9](\/([^\s"]*[^.!,;?()\s])?)?)/g, '$1<a href="$2">$2</a>');
 
         // Turn markdown links into links
         l = blerg.Util.formatMarkdownLinks(l);