commit ddb96b1b66153653baaaf2958b8cec4003a3e9a2
parent 3ca32dc64b3477875709c0a0f5f2ed3ee0b75c40
Author: Davide P. Cervone <dpvc@union.edu>
Date: Tue, 19 Aug 2014 15:09:34 -0400
Move CoreParent, CoreText, remap, and remapChars to element jax (since shared among the output jax), and fix positioning of double accents like \vec{\vec{x}}. Resolves issue #877.
Diffstat:
3 files changed, 56 insertions(+), 69 deletions(-)
diff --git a/unpacked/jax/element/mml/jax.js b/unpacked/jax/element/mml/jax.js
@@ -600,6 +600,38 @@ MathJax.ElementJax.mml.Augment({
},
isEmbellished: function () {return true},
hasNewline: function () {return (this.Get("linebreak") === MML.LINEBREAK.NEWLINE)},
+ CoreParent: function () {
+ var parent = this;
+ while (parent && parent.isEmbellished() &&
+ parent.CoreMO() === this && !parent.isa(MML.math)) {parent = parent.Parent()}
+ return parent;
+ },
+ CoreText: function (parent) {
+ if (!parent) {return ""}
+ if (parent.isEmbellished()) {return parent.CoreMO().data.join("")}
+ while ((((parent.isa(MML.mrow) || parent.isa(MML.TeXAtom) ||
+ parent.isa(MML.mstyle) || parent.isa(MML.mphantom)) &&
+ parent.data.length === 1) || parent.isa(MML.munderover)) &&
+ parent.data[0]) {parent = parent.data[0]}
+ if (!parent.isToken) {return ""} else {return parent.data.join("")}
+ },
+ remapChars: {
+ '*':"\u2217",
+ '"':"\u2033",
+ "\u00B0":"\u2218",
+ "\u00B2":"2",
+ "\u00B3":"3",
+ "\u00B4":"\u2032",
+ "\u00B9":"1"
+ },
+ remap: function (text,map) {
+ text = text.replace(/-/g,"\u2212");
+ if (map) {
+ text = text.replace(/'/g,"\u2032").replace(/`/g,"\u2035");
+ if (text.length === 1) {text = map[text]||text}
+ }
+ return text;
+ },
setTeXclass: function (prev) {
var values = this.getValues("form","lspace","rspace","fence"); // sets useMMLspacing
if (this.useMMLspacing) {this.texClass = MML.TEXCLASS.NONE; return this}
diff --git a/unpacked/jax/output/HTML-CSS/jax.js b/unpacked/jax/output/HTML-CSS/jax.js
@@ -1706,6 +1706,11 @@
if (this.HTMLlineBreaks(span)) {span = this.HTMLmultiline(span)}
this.HTMLhandleSpace(span);
this.HTMLhandleColor(span);
+ if (this.data.length === 1 && this.data[0]) {
+ // copy skew data from accented character
+ var bbox = this.data[0].HTMLspanElement().bbox;
+ if (bbox.skew) span.bbox.skew = bbox.skew;
+ }
return span;
},
HTMLlineBreaks: function () {return false},
@@ -2117,7 +2122,7 @@
//
var parent = this.CoreParent(),
isScript = (parent && parent.isa(MML.msubsup) && this !== parent.data[parent.base]),
- mapchars = (isScript?this.HTMLremapChars:null);
+ mapchars = (isScript?this.remapChars:null);
if (text.length === 1 && parent && parent.isa(MML.munderover) &&
this.CoreText(parent.data[parent.base]).length === 1) {
var over = parent.data[parent.over], under = parent.data[parent.under];
@@ -2133,7 +2138,7 @@
// Typeset contents
//
for (var i = 0, m = this.data.length; i < m; i++)
- {if (this.data[i]) {this.data[i].toHTML(span,variant,this.HTMLremap,mapchars)}}
+ {if (this.data[i]) {this.data[i].toHTML(span,variant,this.remap,mapchars)}}
if (!span.bbox) {span.bbox = this.HTMLzeroBBox()}
if (text.length !== 1) {delete span.bbox.skew}
//
@@ -2174,37 +2179,6 @@
this.HTMLhandleDir(span);
return span;
},
- CoreParent: function () {
- var parent = this;
- while (parent && parent.isEmbellished() &&
- parent.CoreMO() === this && !parent.isa(MML.math)) {parent = parent.Parent()}
- return parent;
- },
- CoreText: function (parent) {
- if (!parent) {return ""}
- if (parent.isEmbellished()) {return parent.CoreMO().data.join("")}
- while ((parent.isa(MML.mrow) || parent.isa(MML.TeXAtom) ||
- parent.isa(MML.mstyle) || parent.isa(MML.mphantom)) &&
- parent.data.length === 1 && parent.data[0]) {parent = parent.data[0]}
- if (!parent.isToken) {return ""} else {return parent.data.join("")}
- },
- HTMLremapChars: {
- '*':"\u2217",
- '"':"\u2033",
- "\u00B0":"\u2218",
- "\u00B2":"2",
- "\u00B3":"3",
- "\u00B4":"\u2032",
- "\u00B9":"1"
- },
- HTMLremap: function (text,map) {
- text = text.replace(/-/g,"\u2212");
- if (map) {
- text = text.replace(/'/g,"\u2032").replace(/`/g,"\u2035");
- if (text.length === 1) {text = map[text]||text}
- }
- return text;
- },
HTMLcanStretch: function (direction) {
if (!this.Get("stretchy")) {return false}
var c = this.data.join("");
@@ -2662,7 +2636,10 @@
if (i == this.over) {
if (accent) {
k = Math.max(t * scale * factor,2.5/this.em); z3 = 0;
- if (base.bbox.skew) {x += base.bbox.skew}
+ if (base.bbox.skew) {
+ x += base.bbox.skew; span.bbox.skew = base.bbox.skew;
+ if (x+box.bbox.w > WW) {span.bbox.skew += (WW-box.bbox.w-x)/2}
+ }
} else {
z1 = HTMLCSS.TeX.big_op_spacing1 * scale * factor;
z2 = HTMLCSS.TeX.big_op_spacing3 * scale * factor;
diff --git a/unpacked/jax/output/SVG/jax.js b/unpacked/jax/output/SVG/jax.js
@@ -1102,6 +1102,8 @@
this.SVGdata.h = svg.h, this.SVGdata.d = svg.d;
if (svg.y) {this.SVGdata.h += svg.y; this.SVGdata.d -= svg.y}
if (svg.X != null) {this.SVGdata.X = svg.X}
+ if (svg.skew) {this.SVGdata.skew = svg.skew}
+ if (svg.ic) {this.SVGdata.ic = svg.ic}
if (this["class"]) {svg.removeable = false; SVG.Element(svg.element,{"class":this["class"]})}
// FIXME: if an element is split by linebreaking, the ID will be the same on both parts
// FIXME: if an element has an id, its zoomed copy will have the same ID
@@ -1420,7 +1422,7 @@
//
var parent = this.CoreParent(),
isScript = (parent && parent.isa(MML.msubsup) && this !== parent.data[0]),
- mapchars = (isScript?this.SVGremapChars:null);
+ mapchars = (isScript?this.remapChars:null);
if (this.data.join("").length === 1 && parent && parent.isa(MML.munderover) &&
this.CoreText(parent.data[parent.base]).length === 1) {
var over = parent.data[parent.over], under = parent.data[parent.under];
@@ -1437,7 +1439,7 @@
//
for (var i = 0, m = this.data.length; i < m; i++) {
if (this.data[i]) {
- var text = this.data[i].toSVG(variant,scale,this.SVGremap,mapchars), x = svg.w;
+ var text = this.data[i].toSVG(variant,scale,this.remap,mapchars), x = svg.w;
if (x === 0 && -text.l > 10*text.w) {x += -text.l} // initial combining character doesn't combine
svg.Add(text,x,0,true);
if (text.skew) {svg.skew = text.skew}
@@ -1459,37 +1461,6 @@
this.SVGsaveData(svg);
return svg;
},
- CoreParent: function () {
- var parent = this;
- while (parent && parent.isEmbellished() &&
- parent.CoreMO() === this && !parent.isa(MML.math)) {parent = parent.Parent()}
- return parent;
- },
- CoreText: function (parent) {
- if (!parent) {return ""}
- if (parent.isEmbellished()) {return parent.CoreMO().data.join("")}
- while ((parent.isa(MML.mrow) || parent.isa(MML.TeXAtom) ||
- parent.isa(MML.mstyle) || parent.isa(MML.mphantom)) &&
- parent.data.length === 1 && parent.data[0]) {parent = parent.data[0]}
- if (!parent.isToken) {return ""} else {return parent.data.join("")}
- },
- SVGremapChars: {
- '*':"\u2217",
- '"':"\u2033",
- "\u00B0":"\u2218",
- "\u00B2":"2",
- "\u00B3":"3",
- "\u00B4":"\u2032",
- "\u00B9":"1"
- },
- SVGremap: function (text,map) {
- text = text.replace(/-/g,"\u2212");
- if (map) {
- text = text.replace(/'/g,"\u2032").replace(/`/g,"\u2035");
- if (text.length === 1) {text = map[text]||text}
- }
- return text;
- },
SVGcanStretch: function (direction) {
if (!this.Get("stretchy")) {return false}
var c = this.data.join("");
@@ -1675,6 +1646,10 @@
for (var i = 0, m = this.data.length; i < m; i++)
{if (this.data[i]) {svg.Check(this.data[i])}}
svg.Stretch(); svg.Clean();
+ if (this.data.length === 1 && this.data[0]) {
+ var data = this.data[0].SVGdata;
+ if (data.skew) {svg.skew = data.skew}
+ }
if (this.SVGlineBreaks(svg)) {svg = this.SVGmultiline(svg)}
this.SVGhandleColor(svg);
this.SVGsaveData(svg);
@@ -1914,7 +1889,10 @@
if (i == this.over) {
if (accent) {
k = t * scale; z3 = 0;
- if (base.skew) {x += base.skew}
+ if (base.skew) {
+ x += base.skew; svg.skew = base.skew;
+ if (x+box.w > WW) {svg.skew += (WW-box.w-x)/2}
+ }
} else {
z1 = SVG.TeX.big_op_spacing1 * scale;
z2 = SVG.TeX.big_op_spacing3 * scale;
@@ -2112,7 +2090,7 @@
if (this.texClass === MML.TEXCLASS.VCENTER)
{y = SVG.TeX.axis_height - (box.h+box.d)/2 + box.d}
svg.Add(box,0,y);
- svg.ic = box.ic;
+ svg.ic = box.ic; svg.skew = box.skew;
}
this.SVGhandleColor(svg);
this.SVGsaveData(svg);
