43 files changed, 74 insertions, 99 deletions

diff --git a/trunk/infrastructure/ace/www/ace2_common.js b/infrastructure/ace/www/ace2_common.js
index 4a08de6..4a08de6 100644
--- a/trunk/infrastructure/ace/www/ace2_common.js
+++ b/infrastructure/ace/www/ace2_common.js
diff --git a/trunk/infrastructure/ace/www/ace2_common_dev.js b/infrastructure/ace/www/ace2_common_dev.js
index 8fb88b0..8fb88b0 100644
--- a/trunk/infrastructure/ace/www/ace2_common_dev.js
+++ b/infrastructure/ace/www/ace2_common_dev.js
diff --git a/trunk/infrastructure/ace/www/ace2_inner.js b/infrastructure/ace/www/ace2_inner.js
index e817c95..e817c95 100644
--- a/trunk/infrastructure/ace/www/ace2_inner.js
+++ b/infrastructure/ace/www/ace2_inner.js
diff --git a/trunk/infrastructure/ace/www/ace2_outer.js b/infrastructure/ace/www/ace2_outer.js
index b0fc20c..b0fc20c 100644
--- a/trunk/infrastructure/ace/www/ace2_outer.js
+++ b/infrastructure/ace/www/ace2_outer.js
diff --git a/trunk/infrastructure/ace/www/ace2_wrapper.js b/infrastructure/ace/www/ace2_wrapper.js
index b62e09d..b62e09d 100644
--- a/trunk/infrastructure/ace/www/ace2_wrapper.js
+++ b/infrastructure/ace/www/ace2_wrapper.js
diff --git a/trunk/infrastructure/ace/www/bbtree.js b/infrastructure/ace/www/bbtree.js
index 70cb8c0..70cb8c0 100644
--- a/trunk/infrastructure/ace/www/bbtree.js
+++ b/infrastructure/ace/www/bbtree.js
diff --git a/trunk/infrastructure/ace/www/changesettracker.js b/infrastructure/ace/www/changesettracker.js
index d6fe018..d6fe018 100644
--- a/trunk/infrastructure/ace/www/changesettracker.js
+++ b/infrastructure/ace/www/changesettracker.js
diff --git a/trunk/infrastructure/ace/www/colorutils.js b/infrastructure/ace/www/colorutils.js
index bb61de3..bb61de3 100644
--- a/trunk/infrastructure/ace/www/colorutils.js
+++ b/infrastructure/ace/www/colorutils.js
diff --git a/trunk/infrastructure/ace/www/contentcollector.js b/infrastructure/ace/www/contentcollector.js
index c5d8ddb..c5d8ddb 100644
--- a/trunk/infrastructure/ace/www/contentcollector.js
+++ b/infrastructure/ace/www/contentcollector.js
diff --git a/trunk/infrastructure/ace/www/cssmanager.js b/infrastructure/ace/www/cssmanager.js
index a5c549b..a5c549b 100644
--- a/trunk/infrastructure/ace/www/cssmanager.js
+++ b/infrastructure/ace/www/cssmanager.js
diff --git a/trunk/infrastructure/ace/www/dev.html b/infrastructure/ace/www/dev.html
index 0a9768e..0a9768e 100644
--- a/trunk/infrastructure/ace/www/dev.html
+++ b/infrastructure/ace/www/dev.html
diff --git a/trunk/infrastructure/ace/www/domline.js b/infrastructure/ace/www/domline.js
index e8a9ba7..38cddf5 100644
--- a/trunk/infrastructure/ace/www/domline.js
+++ b/infrastructure/ace/www/domline.js
@@ -1,4 +1,5 @@
 // THIS FILE IS ALSO AN APPJET MODULE: etherpad.collab.ace.domline
+// %APPJET%: import("etherpad.admin.plugins");
 
 /**
  * Copyright 2009 Google Inc.
@@ -16,6 +17,10 @@
  * limitations under the License.
  */
 
+// requires: top
+// requires: plugins
+// requires: undefined
+
 var domline = {};
 domline.noop = function() {};
 domline.identity = function(x) { return x; };
@@ -85,12 +90,6 @@ domline.createDomLine = function(nonEmpty, doesWrap, optBrowser, optDocument) {
 	return space+"url";
       });
     }
-    if (cls.indexOf('padtag') >= 0) {
-      cls = cls.replace(/(^| )padtag:(\S+)/g, function(x0, space, padtag) {
-	href = '/ep/tag/?query=' + padtag;
-	return space+"padtag padtag_"+padtag;
-      });
-    }
     if (cls.indexOf('tag') >= 0) {
       cls = cls.replace(/(^| )tag:(\S+)/g, function(x0, space, tag) {
 	if (! simpleTags) simpleTags = [];
@@ -98,12 +97,22 @@ domline.createDomLine = function(nonEmpty, doesWrap, optBrowser, optDocument) {
 	return space+tag;
       });
     }
+
+    var extraOpenTags = "";
+    var extraCloseTags = "";
+
+    ((top == undefined) ? plugins : top.plugins).callHook(
+      "aceCreateDomLine", {domline:domline, cls:cls}
+    ).map(function (modifier) {
+      cls = modifier.cls;
+      extraOpenTags = extraOpenTags+modifier.extraOpenTags;
+      extraCloseTags = modifier.extraCloseTags+extraCloseTags;
+    });
+
     if ((! txt) && cls) {
       lineClass = domline.addToLineClass(lineClass, cls);
     }
     else if (txt) {
-      var extraOpenTags = "";
-      var extraCloseTags = "";
       if (href) {
 	extraOpenTags = extraOpenTags+'<a href="'+
 	  href.replace(/\"/g, '&quot;')+'">';
diff --git a/trunk/infrastructure/ace/www/easy_sync.js b/infrastructure/ace/www/easy_sync.js
index 86a4327..86a4327 100644
--- a/trunk/infrastructure/ace/www/easy_sync.js
+++ b/infrastructure/ace/www/easy_sync.js
diff --git a/trunk/infrastructure/ace/www/easysync2.js b/infrastructure/ace/www/easysync2.js
index efc5b99..efc5b99 100644
--- a/trunk/infrastructure/ace/www/easysync2.js
+++ b/infrastructure/ace/www/easysync2.js
diff --git a/trunk/infrastructure/ace/www/easysync2_tests.js b/infrastructure/ace/www/easysync2_tests.js
index 2fcf202..2fcf202 100644
--- a/trunk/infrastructure/ace/www/easysync2_tests.js
+++ b/infrastructure/ace/www/easysync2_tests.js
diff --git a/trunk/infrastructure/ace/www/editor.css b/infrastructure/ace/www/editor.css
index 0a43478..0a43478 100644
--- a/trunk/infrastructure/ace/www/editor.css
+++ b/infrastructure/ace/www/editor.css
diff --git a/trunk/infrastructure/ace/www/firebug/errorIcon.png b/infrastructure/ace/www/firebug/errorIcon.png
index 2d75261..2d75261 100644
--- a/trunk/infrastructure/ace/www/firebug/errorIcon.png
+++ b/infrastructure/ace/www/firebug/errorIcon.png
diff --git a/trunk/infrastructure/ace/www/firebug/firebug.css b/infrastructure/ace/www/firebug/firebug.css
index 1f041c4..1f041c4 100644
--- a/trunk/infrastructure/ace/www/firebug/firebug.css
+++ b/infrastructure/ace/www/firebug/firebug.css
diff --git a/trunk/infrastructure/ace/www/firebug/firebug.html b/infrastructure/ace/www/firebug/firebug.html
index 861e639..861e639 100644
--- a/trunk/infrastructure/ace/www/firebug/firebug.html
+++ b/infrastructure/ace/www/firebug/firebug.html
diff --git a/trunk/infrastructure/ace/www/firebug/firebug.js b/infrastructure/ace/www/firebug/firebug.js
index d3c1978..d3c1978 100644
--- a/trunk/infrastructure/ace/www/firebug/firebug.js
+++ b/infrastructure/ace/www/firebug/firebug.js
diff --git a/trunk/infrastructure/ace/www/firebug/firebugx.js b/infrastructure/ace/www/firebug/firebugx.js
index b2cc49c..b2cc49c 100644
--- a/trunk/infrastructure/ace/www/firebug/firebugx.js
+++ b/infrastructure/ace/www/firebug/firebugx.js
diff --git a/trunk/infrastructure/ace/www/firebug/infoIcon.png b/infrastructure/ace/www/firebug/infoIcon.png
index da1e533..da1e533 100644
--- a/trunk/infrastructure/ace/www/firebug/infoIcon.png
+++ b/infrastructure/ace/www/firebug/infoIcon.png
diff --git a/trunk/infrastructure/ace/www/firebug/warningIcon.png b/infrastructure/ace/www/firebug/warningIcon.png
index de51084..de51084 100644
--- a/trunk/infrastructure/ace/www/firebug/warningIcon.png
+++ b/infrastructure/ace/www/firebug/warningIcon.png
diff --git a/trunk/infrastructure/ace/www/index.html b/infrastructure/ace/www/index.html
index a1e6e96..a1e6e96 100644
--- a/trunk/infrastructure/ace/www/index.html
+++ b/infrastructure/ace/www/index.html
diff --git a/trunk/infrastructure/ace/www/inner.css b/infrastructure/ace/www/inner.css
index 7479cfe..7479cfe 100644
--- a/trunk/infrastructure/ace/www/inner.css
+++ b/infrastructure/ace/www/inner.css
diff --git a/trunk/infrastructure/ace/www/jquery-1.2.1.js b/infrastructure/ace/www/jquery-1.2.1.js
index b4eb132..b4eb132 100644
--- a/trunk/infrastructure/ace/www/jquery-1.2.1.js
+++ b/infrastructure/ace/www/jquery-1.2.1.js
diff --git a/trunk/infrastructure/ace/www/lang_html.js b/infrastructure/ace/www/lang_html.js
index f9eff8e..f9eff8e 100644
--- a/trunk/infrastructure/ace/www/lang_html.js
+++ b/infrastructure/ace/www/lang_html.js
diff --git a/trunk/infrastructure/ace/www/lang_js.js b/infrastructure/ace/www/lang_js.js
index 4bbc5b4..4bbc5b4 100644
--- a/trunk/infrastructure/ace/www/lang_js.js
+++ b/infrastructure/ace/www/lang_js.js
diff --git a/trunk/infrastructure/ace/www/lexer_support.js b/infrastructure/ace/www/lexer_support.js
index 3d54f5c..3d54f5c 100644
--- a/trunk/infrastructure/ace/www/lexer_support.js
+++ b/infrastructure/ace/www/lexer_support.js
diff --git a/trunk/infrastructure/ace/www/linestylefilter.js b/infrastructure/ace/www/linestylefilter.js
index f0f1343..d69376a 100644
--- a/trunk/infrastructure/ace/www/linestylefilter.js
+++ b/infrastructure/ace/www/linestylefilter.js
@@ -1,5 +1,6 @@
 // THIS FILE IS ALSO AN APPJET MODULE: etherpad.collab.ace.linestylefilter
 // %APPJET%: import("etherpad.collab.ace.easysync2.Changeset");
+// %APPJET%: import("etherpad.admin.plugins");
 
 /**
  * Copyright 2009 Google Inc.
@@ -18,6 +19,9 @@
  */
 
 // requires: easysync2.Changeset
+// requires: top
+// requires: plugins
+// requires: undefined
 
 var linestylefilter = {};
 
@@ -135,104 +139,60 @@ linestylefilter.getAtSignSplitterFilter = function(lineText,
                                                   splitPoints);
 };
 
-linestylefilter.REGEX_WORDCHAR = /[\u0030-\u0039\u0041-\u005A\u0061-\u007A\u00C0-\u00D6\u00D8-\u00F6\u00F8-\u00FF\u0100-\u1FFF\u3040-\u9FFF\uF900-\uFDFF\uFE70-\uFEFE\uFF10-\uFF19\uFF21-\uFF3A\uFF41-\uFF5A\uFF66-\uFFDC]/;
-linestylefilter.REGEX_URLCHAR = new RegExp('('+/[-:@a-zA-Z0-9_.,~%+\/\\?=&#;()$]/.source+'|'+linestylefilter.REGEX_WORDCHAR.source+')');
-linestylefilter.REGEX_URL = new RegExp(/(?:(?:https?|s?ftp|ftps|file|smb|afp|nfs|(x-)?man|gopher|txmt):\/\/|mailto:)/.source+linestylefilter.REGEX_URLCHAR.source+'*(?![:.,;])'+linestylefilter.REGEX_URLCHAR.source, 'g');
-
-linestylefilter.getURLFilter = function(lineText, textAndClassFunc) {
-  linestylefilter.REGEX_URL.lastIndex = 0;
-  var urls = null;
-  var splitPoints = null;
-  var execResult;
-  while ((execResult = linestylefilter.REGEX_URL.exec(lineText))) {
-    if (! urls) {
-      urls = [];
-      splitPoints = [];
+linestylefilter.getRegexpFilter = function (regExp, tag) {
+  return function (lineText, textAndClassFunc) {
+    regExp.lastIndex = 0;
+    var regExpMatchs = null;
+    var splitPoints = null;
+    var execResult;
+    while ((execResult = regExp.exec(lineText))) {
+      if (! regExpMatchs) {
+	regExpMatchs = [];
+	splitPoints = [];
+      }
+      var startIndex = execResult.index;
+      var regExpMatch = execResult[0];
+      regExpMatchs.push([startIndex, regExpMatch]);
+      splitPoints.push(startIndex, startIndex + regExpMatch.length);
     }
-    var startIndex = execResult.index;
-    var url = execResult[0];
-    urls.push([startIndex, url]);
-    splitPoints.push(startIndex, startIndex + url.length);
-  }
 
-  if (! urls) return textAndClassFunc;
+    if (! regExpMatchs) return textAndClassFunc;
 
-  function urlForIndex(idx) {
-    for(var k=0; k<urls.length; k++) {
-      var u = urls[k];
-      if (idx >= u[0] && idx < u[0]+u[1].length) {
-	return u[1];
+    function regExpMatchForIndex(idx) {
+      for(var k=0; k<regExpMatchs.length; k++) {
+	var u = regExpMatchs[k];
+	if (idx >= u[0] && idx < u[0]+u[1].length) {
+	  return u[1];
+	}
       }
+      return false;
     }
-    return false;
-  }
 
-  var handleUrlsAfterSplit = (function() {
-    var curIndex = 0;
-    return function(txt, cls) {
-      var txtlen = txt.length;
-      var newCls = cls;
-      var url = urlForIndex(curIndex);
-      if (url) {
-	newCls += " url:"+url;
-      }
-      textAndClassFunc(txt, newCls);
-      curIndex += txtlen;
-    };
-  })();
-
-  return linestylefilter.textAndClassFuncSplitter(handleUrlsAfterSplit,
-                                                  splitPoints);
+    var handleRegExpMatchsAfterSplit = (function() {
+      var curIndex = 0;
+      return function(txt, cls) {
+	var txtlen = txt.length;
+	var newCls = cls;
+	var regExpMatch = regExpMatchForIndex(curIndex);
+	if (regExpMatch) {
+	  newCls += " "+tag+":"+regExpMatch;
+	}
+	textAndClassFunc(txt, newCls);
+	curIndex += txtlen;
+      };
+    })();
+
+    return linestylefilter.textAndClassFuncSplitter(handleRegExpMatchsAfterSplit,
+						    splitPoints);
+  };
 };
 
-/* Copy of getURLFilter with slight modifications, should probably merge and just use different regexps */
-linestylefilter.REGEX_PADTAG = new RegExp("#[^,#!\\s][^,#!\\s]*", "g");
 
-linestylefilter.getPadTagFilter = function(lineText, textAndClassFunc) {
-  linestylefilter.REGEX_PADTAG.lastIndex = 0;
-  var padTags = null;
-  var splitPoints = null;
-  var execResult;
-  while ((execResult = linestylefilter.REGEX_PADTAG.exec(lineText))) {
-    if (! padTags) {
-      padTags = [];
-      splitPoints = [];
-    }
-    var startIndex = execResult.index;
-    var padTag = execResult[0];
-    padTags.push([startIndex, padTag]);
-    splitPoints.push(startIndex, startIndex + padTag.length);
-  }
-
-  if (! padTags) return textAndClassFunc;
-
-  function padTagForIndex(idx) {
-    for(var k=0; k<padTags.length; k++) {
-      var u = padTags[k];
-      if (idx >= u[0] && idx < u[0]+u[1].length) {
-	return u[1];
-      }
-    }
-    return false;
-  }
-
-  var handlePadTagsAfterSplit = (function() {
-    var curIndex = 0;
-    return function(txt, cls) {
-      var txtlen = txt.length;
-      var newCls = cls;
-      var padTag = padTagForIndex(curIndex);
-      if (padTag) {
-	newCls += " padtag:"+padTag.substring(1);
-      }
-      textAndClassFunc(txt, newCls);
-      curIndex += txtlen;
-    };
-  })();
-
-  return linestylefilter.textAndClassFuncSplitter(handlePadTagsAfterSplit,
-                                                  splitPoints);
-}
+linestylefilter.REGEX_WORDCHAR = /[\u0030-\u0039\u0041-\u005A\u0061-\u007A\u00C0-\u00D6\u00D8-\u00F6\u00F8-\u00FF\u0100-\u1FFF\u3040-\u9FFF\uF900-\uFDFF\uFE70-\uFEFE\uFF10-\uFF19\uFF21-\uFF3A\uFF41-\uFF5A\uFF66-\uFFDC]/;
+linestylefilter.REGEX_URLCHAR = new RegExp('('+/[-:@a-zA-Z0-9_.,~%+\/\\?=&#;()$]/.source+'|'+linestylefilter.REGEX_WORDCHAR.source+')');
+linestylefilter.REGEX_URL = new RegExp(/(?:(?:https?|s?ftp|ftps|file|smb|afp|nfs|(x-)?man|gopher|txmt):\/\/|mailto:)/.source+linestylefilter.REGEX_URLCHAR.source+'*(?![:.,;])'+linestylefilter.REGEX_URLCHAR.source, 'g');
+linestylefilter.getURLFilter = linestylefilter.getRegexpFilter(
+  linestylefilter.REGEX_URL, 'url');
 
 linestylefilter.textAndClassFuncSplitter = function(func, splitPointsOpt) {
   var nextPointIndex = 0;
@@ -276,8 +236,14 @@ linestylefilter.textAndClassFuncSplitter = function(func, splitPointsOpt) {
 };
 
 linestylefilter.getFilterStack = function(lineText, textAndClassFunc, browser) {
-  var func = linestylefilter.getURLFilter(lineText, textAndClassFunc);
-  func = linestylefilter.getPadTagFilter(lineText, func);
+  var func = linestylefilter.getURLFilter(lineText, textAndClassFunc);  
+
+  var hookFilters = ((top == undefined) ? plugins : top.plugins).callHook(
+    "aceGetFilterStack", {linestylefilter:linestylefilter, browser:browser});
+  hookFilters.map(function (hookFilter) {
+    func = hookFilter(lineText, func);
+  });
+
   if (browser !== undefined && browser.msie) {
     // IE7+ will take an e-mail address like <foo@bar.com> and linkify it to foo@bar.com.
     // We then normalize it back to text with no angle brackets.  It's weird.  So always
diff --git a/trunk/infrastructure/ace/www/magicdom.js b/infrastructure/ace/www/magicdom.js
index 4bad3d4..4bad3d4 100644
--- a/trunk/infrastructure/ace/www/magicdom.js
+++ b/infrastructure/ace/www/magicdom.js
diff --git a/trunk/infrastructure/ace/www/multilang_lexer.js b/infrastructure/ace/www/multilang_lexer.js
index 9617981..9617981 100644
--- a/trunk/infrastructure/ace/www/multilang_lexer.js
+++ b/infrastructure/ace/www/multilang_lexer.js
diff --git a/trunk/infrastructure/ace/www/processing.js b/infrastructure/ace/www/processing.js
index 988ef76..988ef76 100644
--- a/trunk/infrastructure/ace/www/processing.js
+++ b/infrastructure/ace/www/processing.js
diff --git a/trunk/infrastructure/ace/www/profiler.js b/infrastructure/ace/www/profiler.js
index 24b68a2..24b68a2 100644
--- a/trunk/infrastructure/ace/www/profiler.js
+++ b/infrastructure/ace/www/profiler.js
diff --git a/trunk/infrastructure/ace/www/skiplist.js b/infrastructure/ace/www/skiplist.js
index e6c2e04..e6c2e04 100644
--- a/trunk/infrastructure/ace/www/skiplist.js
+++ b/infrastructure/ace/www/skiplist.js
diff --git a/trunk/infrastructure/ace/www/spanlist.js b/infrastructure/ace/www/spanlist.js
index 756a411..756a411 100644
--- a/trunk/infrastructure/ace/www/spanlist.js
+++ b/infrastructure/ace/www/spanlist.js
diff --git a/trunk/infrastructure/ace/www/syntax-new.css b/infrastructure/ace/www/syntax-new.css
index 30f1823..30f1823 100644
--- a/trunk/infrastructure/ace/www/syntax-new.css
+++ b/infrastructure/ace/www/syntax-new.css
diff --git a/trunk/infrastructure/ace/www/syntax.css b/infrastructure/ace/www/syntax.css
index e018320..e018320 100644
--- a/trunk/infrastructure/ace/www/syntax.css
+++ b/infrastructure/ace/www/syntax.css
diff --git a/trunk/infrastructure/ace/www/test.html b/infrastructure/ace/www/test.html
index 73fa45c..73fa45c 100644
--- a/trunk/infrastructure/ace/www/test.html
+++ b/infrastructure/ace/www/test.html
diff --git a/trunk/infrastructure/ace/www/testcode.js b/infrastructure/ace/www/testcode.js
index f393335..f393335 100644
--- a/trunk/infrastructure/ace/www/testcode.js
+++ b/infrastructure/ace/www/testcode.js
diff --git a/trunk/infrastructure/ace/www/toSource.js b/infrastructure/ace/www/toSource.js
index bf96df7..bf96df7 100644
--- a/trunk/infrastructure/ace/www/toSource.js
+++ b/infrastructure/ace/www/toSource.js
diff --git a/trunk/infrastructure/ace/www/undomodule.js b/infrastructure/ace/www/undomodule.js
index b8a56f9..b8a56f9 100644
--- a/trunk/infrastructure/ace/www/undomodule.js
+++ b/infrastructure/ace/www/undomodule.js
diff --git a/trunk/infrastructure/ace/www/virtual_lines.js b/infrastructure/ace/www/virtual_lines.js
index 86e3dea..86e3dea 100644
--- a/trunk/infrastructure/ace/www/virtual_lines.js
+++ b/infrastructure/ace/www/virtual_lines.js