Merge branch 'issue578' into develop. Issue #578.

This commit is contained in:
Davide P. Cervone 2014-02-07 10:00:19 -05:00
commit 5cb8bbb968
2 changed files with 2 additions and 16 deletions

View File

@ -25,7 +25,7 @@
*/ */
MathJax.Hub.Register.StartupHook("HTML-CSS Jax Ready",function () { MathJax.Hub.Register.StartupHook("HTML-CSS Jax Ready",function () {
var VERSION = "2.3"; var VERSION = "2.3.1";
var MML = MathJax.ElementJax.mml, var MML = MathJax.ElementJax.mml,
HTMLCSS = MathJax.OutputJax["HTML-CSS"]; HTMLCSS = MathJax.OutputJax["HTML-CSS"];
@ -34,18 +34,11 @@ MathJax.Hub.Register.StartupHook("HTML-CSS Jax Ready",function () {
span = this.HTMLhandleSize(this.HTMLcreateSpan(span)); span = this.HTMLhandleSize(this.HTMLcreateSpan(span));
var values = this.getValues("lquote","rquote"); var values = this.getValues("lquote","rquote");
var text = this.data.join(""); // FIXME: handle mglyph? var text = this.data.join(""); // FIXME: handle mglyph?
var pattern = [];
if (values.lquote.length === 1) {pattern.push(this.HTMLquoteRegExp(values.lquote))}
if (values.rquote.length === 1) {pattern.push(this.HTMLquoteRegExp(values.rquote))}
if (pattern.length) {text = text.replace(RegExp("("+pattern.join("|")+")","g"),"\\$1")}
this.HTMLhandleVariant(span,this.HTMLgetVariant(),values.lquote+text+values.rquote); this.HTMLhandleVariant(span,this.HTMLgetVariant(),values.lquote+text+values.rquote);
this.HTMLhandleSpace(span); this.HTMLhandleSpace(span);
this.HTMLhandleColor(span); this.HTMLhandleColor(span);
this.HTMLhandleDir(span); this.HTMLhandleDir(span);
return span; return span;
},
HTMLquoteRegExp: function (string) {
return string.replace(/([.*+?|{}()\[\]\\])/g,"\\$1");
} }
}); });
MML.ms.prototype.defaults.mathvariant = 'monospace'; MML.ms.prototype.defaults.mathvariant = 'monospace';

View File

@ -25,7 +25,7 @@
*/ */
MathJax.Hub.Register.StartupHook("SVG Jax Ready",function () { MathJax.Hub.Register.StartupHook("SVG Jax Ready",function () {
var VERSION = "2.3"; var VERSION = "2.3.1";
var MML = MathJax.ElementJax.mml, var MML = MathJax.ElementJax.mml,
SVG = MathJax.OutputJax.SVG; SVG = MathJax.OutputJax.SVG;
@ -36,18 +36,11 @@ MathJax.Hub.Register.StartupHook("SVG Jax Ready",function () {
var values = this.getValues("lquote","rquote"); var values = this.getValues("lquote","rquote");
var variant = this.SVGgetVariant(), scale = this.SVGgetScale(); var variant = this.SVGgetVariant(), scale = this.SVGgetScale();
var text = this.data.join(""); // FIXME: handle mglyph? var text = this.data.join(""); // FIXME: handle mglyph?
var pattern = [];
if (values.lquote.length === 1) {pattern.push(this.SVGquoteRegExp(values.lquote))}
if (values.rquote.length === 1) {pattern.push(this.SVGquoteRegExp(values.rquote))}
if (pattern.length) {text = text.replace(RegExp("("+pattern.join("|")+")","g"),"\\$1")}
svg.Add(this.SVGhandleVariant(variant,scale,values.lquote+text+values.rquote)); svg.Add(this.SVGhandleVariant(variant,scale,values.lquote+text+values.rquote));
svg.Clean(); svg.Clean();
this.SVGhandleColor(svg); this.SVGhandleColor(svg);
this.SVGsaveData(svg); this.SVGsaveData(svg);
return svg; return svg;
},
SVGquoteRegExp: function (string) {
return string.replace(/([.*+?|{}()\[\]\\])/g,"\\$1");
} }
}); });
MML.ms.prototype.defaults.mathvariant = 'monospace'; MML.ms.prototype.defaults.mathvariant = 'monospace';