suzanne.soy/scribble-mathjax
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Make empty rows be the standard height and depth; indeed make ALL rows

Browse Source 
have at least this height and depth.  Resolves both problems in issue #719.
This commit is contained in:
Davide P. Cervone 2014-02-16 05:48:45 -05:00
parent 2927bbfc34
commit 9733c1b614
2 changed files with 18 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
unpacked/jax/output/HTML-CSS/autoload/mtable.js
View File

@ -41,16 +41,17 @@ MathJax.Hub.Register.StartupHook("HTML-CSS Jax Ready",function () {
var stack = HTMLCSS.createStack(span); var stack = HTMLCSS.createStack(span);
var scale = this.HTMLgetScale(), mu = this.HTMLgetMu(span), LABEL = -1; var scale = this.HTMLgetScale(), mu = this.HTMLgetMu(span), LABEL = -1;
var H = [], D = [], W = [], A = [], C = [], i, j, J = -1, m, M, s, row, cell, mo, entries = []; var H = [], D = [], W = [], A = [], C = [], i, j, J = -1,
var LHD = HTMLCSS.FONTDATA.baselineskip * scale * values.useHeight, HD, m, M, s, row, cell, mo, entries = [], HD;
LH = HTMLCSS.FONTDATA.lineH * scale, LD = HTMLCSS.FONTDATA.lineD * scale; var LH = HTMLCSS.FONTDATA.lineH * scale * values.useHeight,
LD = HTMLCSS.FONTDATA.lineD * scale * values.useHeight;
// //
// Create cells and measure columns and rows // Create cells and measure columns and rows
// //
for (i = 0, m = this.data.length; i < m; i++) { for (i = 0, m = this.data.length; i < m; i++) {
row = this.data[i]; s = (row.type === "mlabeledtr" ? LABEL : 0); row = this.data[i]; s = (row.type === "mlabeledtr" ? LABEL : 0);
A[i] = []; H[i] = D[i] = 0; A[i] = []; H[i] = LH; D[i] = LD;
for (j = s, M = row.data.length + s; j < M; j++) { for (j = s, M = row.data.length + s; j < M; j++) {
if (W[j] == null) { if (W[j] == null) {
if (j > J) {J = j} if (j > J) {J = j}
@ -90,8 +91,6 @@ MathJax.Hub.Register.StartupHook("HTML-CSS Jax Ready",function () {
if (A[i][j].bbox.w > W[j]) {W[j] = A[i][j].bbox.w} if (A[i][j].bbox.w > W[j]) {W[j] = A[i][j].bbox.w}
} }
} }
if (H[0]+D[0]) {H[0] = Math.max(H[0],LH)}
if (H[A.length-1]+D[A.length-1]) {D[A.length-1] = Math.max(D[A.length-1],LD)}
// //
// Determine spacing and alignment // Determine spacing and alignment
@ -146,7 +145,7 @@ MathJax.Hub.Register.StartupHook("HTML-CSS Jax Ready",function () {
// Determine array total height // Determine array total height
// //
HD = H[0] + D[A.length-1]; HD = H[0] + D[A.length-1];
for (i = 0, m = A.length-1; i < m; i++) {HD += Math.max((H[i]+D[i] ? LHD : 0),D[i]+H[i+1]+RSPACE[i])} for (i = 0, m = A.length-1; i < m; i++) {HD += Math.max(0,D[i]+H[i+1]+RSPACE[i])}
// //
// Determine frame and line sizes // Determine frame and line sizes
// //
@ -179,7 +178,7 @@ MathJax.Hub.Register.StartupHook("HTML-CSS Jax Ready",function () {
Y = 0; fY = -(HD + fy) + H[0]; Y = 0; fY = -(HD + fy) + H[0];
for (i = 0, m = n-1; i < m; i++) { for (i = 0, m = n-1; i < m; i++) {
// FIXME: Should handle values.align for final row // FIXME: Should handle values.align for final row
var dY = Math.max((H[i]+D[i] ? LHD : 0),D[i]+H[i+1]+RSPACE[i]); var dY = Math.max(0,D[i]+H[i+1]+RSPACE[i]);
Y += dY; fY += dY; Y += dY; fY += dY;
} }
} else { } else {
@ -290,7 +289,7 @@ MathJax.Hub.Register.StartupHook("HTML-CSS Jax Ready",function () {
align = (cell.columnalign||RCALIGN[i][j]||CALIGN[j]); align = (cell.columnalign||RCALIGN[i][j]||CALIGN[j]);
HTMLCSS.alignBox(A[i][j],align,y+dy); HTMLCSS.alignBox(A[i][j],align,y+dy);
} }
if (i < A.length-1) {y -= Math.max((H[i]+D[i] ? LHD : 0),D[i]+H[i+1]+RSPACE[i])} if (i < A.length-1) {y -= Math.max(0,D[i]+H[i+1]+RSPACE[i])}
} }
y = Y; y = Y;
} }
@ -399,7 +398,7 @@ MathJax.Hub.Register.StartupHook("HTML-CSS Jax Ready",function () {
// //
y = Y; y = Y;
for (i = 0, m = A.length-1; i < m; i++) { for (i = 0, m = A.length-1; i < m; i++) {
dy = Math.max(LHD,D[i]+H[i+1]+RSPACE[i]); dy = Math.max(0,D[i]+H[i+1]+RSPACE[i]);
if (RLINES[i] !== "none") { if (RLINES[i] !== "none") {
line = HTMLCSS.createRule(stack,1.25/HTMLCSS.em,0,fW); HTMLCSS.addBox(stack,line); line = HTMLCSS.createRule(stack,1.25/HTMLCSS.em,0,fW); HTMLCSS.addBox(stack,line);
line.bbox = {h:1.25/HTMLCSS.em, d:0, w:fW, rw:fW, lw:0}; line.bbox = {h:1.25/HTMLCSS.em, d:0, w:fW, rw:fW, lw:0};

19
unpacked/jax/output/SVG/autoload/mtable.js
View File

@ -45,16 +45,17 @@ MathJax.Hub.Register.StartupHook("SVG Jax Ready",function () {
var scale = this.SVGgetScale(), mu = this.SVGgetMu(svg); var scale = this.SVGgetScale(), mu = this.SVGgetMu(svg);
var LABEL = -1; var LABEL = -1;
var H = [], D = [], W = [], A = [], C = [], i, j, J = -1, m, M, s, row, cell, mo; var H = [], D = [], W = [], A = [], C = [], i, j, J = -1,
var LHD = SVG.FONTDATA.baselineskip * scale * values.useHeight, HD, m, M, s, row, cell, mo, HD;
LH = SVG.FONTDATA.lineH * scale, LD = SVG.FONTDATA.lineD * scale; var LH = SVG.FONTDATA.lineH * scale * values.useHeight,
LD = SVG.FONTDATA.lineD * scale * values.useHeight;
// //
// Create cells and measure columns and rows // Create cells and measure columns and rows
// //
for (i = 0, m = this.data.length; i < m; i++) { for (i = 0, m = this.data.length; i < m; i++) {
row = this.data[i]; s = (row.type === "mlabeledtr" ? LABEL : 0); row = this.data[i]; s = (row.type === "mlabeledtr" ? LABEL : 0);
A[i] = []; H[i] = D[i] = 0; A[i] = []; H[i] = LH; D[i] = LD;
for (j = s, M = row.data.length + s; j < M; j++) { for (j = s, M = row.data.length + s; j < M; j++) {
if (W[j] == null) { if (W[j] == null) {
if (j > J) {J = j} if (j > J) {J = j}
@ -86,8 +87,6 @@ MathJax.Hub.Register.StartupHook("SVG Jax Ready",function () {
if (A[i][j].w > W[j]) {W[j] = A[i][j].w} if (A[i][j].w > W[j]) {W[j] = A[i][j].w}
} }
} }
if (H[0]+D[0]) {H[0] = Math.max(H[0],LH)}
if (H[A.length-1]+D[A.length-1]) {D[A.length-1] = Math.max(D[A.length-1],LD)}
// //
// Determine spacing and alignment // Determine spacing and alignment
@ -143,7 +142,7 @@ MathJax.Hub.Register.StartupHook("SVG Jax Ready",function () {
// //
HD = H[0] + D[A.length-1]; HD = H[0] + D[A.length-1];
for (i = 0, m = A.length-1; i < m; i++) for (i = 0, m = A.length-1; i < m; i++)
{HD += Math.max((H[i]+D[i] ? LHD : 0),D[i]+H[i+1]+RSPACE[i])} {HD += Math.max(0,D[i]+H[i+1]+RSPACE[i])}
// //
// Determine frame and line sizes // Determine frame and line sizes
// //
@ -176,7 +175,7 @@ MathJax.Hub.Register.StartupHook("SVG Jax Ready",function () {
Y = 0; fY = -(HD + fy) + H[0]; Y = 0; fY = -(HD + fy) + H[0];
for (i = 0, m = n-1; i < m; i++) { for (i = 0, m = n-1; i < m; i++) {
// FIXME: Should handle values.align for final row // FIXME: Should handle values.align for final row
var dY = Math.max((H[i]+D[i] ? LHD : 0),D[i]+H[i+1]+RSPACE[i]); var dY = Math.max(0,D[i]+H[i+1]+RSPACE[i]);
Y += dY; fY += dY; Y += dY; fY += dY;
} }
} else { } else {
@ -274,7 +273,7 @@ MathJax.Hub.Register.StartupHook("SVG Jax Ready",function () {
align = (cell.columnalign||RCALIGN[i][j]||CALIGN[j]) align = (cell.columnalign||RCALIGN[i][j]||CALIGN[j])
C[j].Align(A[i][j],align,0,y+dy); C[j].Align(A[i][j],align,0,y+dy);
} }
if (i < A.length-1) {y -= Math.max((H[i]+D[i] ? LHD : 0),D[i]+H[i+1]+RSPACE[i])} if (i < A.length-1) {y -= Math.max(0,D[i]+H[i+1]+RSPACE[i])}
} }
y = Y; y = Y;
} }
@ -307,7 +306,7 @@ MathJax.Hub.Register.StartupHook("SVG Jax Ready",function () {
// //
y = Y - lw/2; y = Y - lw/2;
for (i = 0, m = A.length-1; i < m; i++) { for (i = 0, m = A.length-1; i < m; i++) {
dy = Math.max(LHD,D[i]+H[i+1]+RSPACE[i]); dy = Math.max(0,D[i]+H[i+1]+RSPACE[i]);
if (RLINES[i] !== "none") if (RLINES[i] !== "none")
{svg.Add(BBOX.HLINE(fW,lw,RLINES[i]),0,y-D[i]-(dy-D[i]-H[i+1])/2)} {svg.Add(BBOX.HLINE(fW,lw,RLINES[i]),0,y-D[i]-(dy-D[i]-H[i+1])/2)}
y -= dy; y -= dy;