commit 2644cbb0d13f1713882824d89b487df68795fe86
parent cab603f40f8d25e37c10add0b7b6da80fc1d38eb
Author: Davide P. Cervone <dpvc@union.edu>
Date: Tue, 30 Apr 2013 13:47:43 -0400
Fix patterns so that if preRemoveClass is empty, the patterns are still OK. Fixes issues found by Fred in testing.
Diffstat:
2 files changed, 8 insertions(+), 6 deletions(-)
diff --git a/unpacked/extensions/asciimath2jax.js b/unpacked/extensions/asciimath2jax.js
@@ -75,9 +75,10 @@ MathJax.Extension.asciimath2jax = {
}
this.start = new RegExp(starts.sort(this.sortLength).join("|"),"g");
this.skipTags = new RegExp("^("+config.skipTags.join("|")+")$","i");
- var ignore = MathJax.Hub.config.preRemoveClass;
- if (config.ignoreClass !== "") {ignore += "|" + config.ignoreClass}
- this.ignoreClass = new RegExp("(^| )("+ignore+")( |$)");
+ var ignore = [];
+ if (MathJax.Hub.config.preRemoveClass) {ignore.push(MathJax.Hub.config.preRemoveClass)}
+ if (config.ignoreClass) {ignore.push(config.ignoreClass)}
+ this.ignoreClass = (ignore.length ? new RegExp("(^| )("+ignore.join("|")+")( |$)") : /^$/);
this.processClass = new RegExp("(^| )("+config.processClass+")( |$)");
return true;
},
diff --git a/unpacked/extensions/tex2jax.js b/unpacked/extensions/tex2jax.js
@@ -107,9 +107,10 @@ MathJax.Extension.tex2jax = {
if (config.processRefs) {parts.push("\\\\(eq)?ref\\{[^}]*\\}")}
this.start = new RegExp(parts.join("|"),"g");
this.skipTags = new RegExp("^("+config.skipTags.join("|")+")$","i");
- var ignore = MathJax.Hub.config.preRemoveClass;
- if (config.ignoreClass !== "") {ignore += "|" + config.ignoreClass}
- this.ignoreClass = new RegExp("(^| )("+ignore+")( |$)");
+ var ignore = [];
+ if (MathJax.Hub.config.preRemoveClass) {ignore.push(MathJax.Hub.config.preRemoveClass)};
+ if (config.ignoreClass) {ignore.push(config.ignoreClass)}
+ this.ignoreClass = (ignore.length ? new RegExp("(^| )("+ignore.join("|")+")( |$)") : /^$/);
this.processClass = new RegExp("(^| )("+config.processClass+")( |$)");
return (parts.length > 0);
},