Only use defaultWidth for zero-width containers in in-line mode

dpvc · dpvc · commit 2fe8c702c76b · 2018-07-09T21:19:26.000-04:00
diff --git a/unpacked/jax/output/CommonHTML/jax.js b/unpacked/jax/output/CommonHTML/jax.js
@@ -489,7 +489,7 @@
           ex = this.defaultEx;
           cwidth = this.defaultWidth;
         }
-        if (cwidth === 0) cwidth = this.defaultWidth;
+        if (cwidth === 0 && !jax.CHTML.display) cwidth = this.defaultWidth;
         if (relwidth) maxwidth = cwidth;
         scale = (this.config.matchFontHeight ? ex/this.TEX.x_height/em : 1);
         scale = Math.floor(Math.max(this.config.minScaleAdjust/100,scale)*this.config.scale);
diff --git a/unpacked/jax/output/HTML-CSS/jax.js b/unpacked/jax/output/HTML-CSS/jax.js
@@ -671,7 +671,7 @@
           jax.HTMLCSS.isHidden = true;
           ex = this.defaultEx; em = this.defaultEm; cwidth = this.defaultWidth;
         }
-        if (cwidth === 0) cwidth = this.defaultWidth;
+        if (cwidth === 0 && !jax.HTMLCSS.display) cwidth = this.defaultWidth;
         if (relwidth) {maxwidth = cwidth}
         scale = (this.config.matchFontHeight ? ex/this.TeX.x_height/em : 1);
         scale = Math.floor(Math.max(this.config.minScaleAdjust/100,scale)*this.config.scale);
diff --git a/unpacked/jax/output/SVG/jax.js b/unpacked/jax/output/SVG/jax.js
@@ -314,7 +314,7 @@
           jax.SVG.isHidden = true;
           ex = this.defaultEx; cwidth = this.defaultWidth;
         }
-        if (cwidth === 0) cwidth = this.defaultWidth;
+        if (cwidth === 0 && !jax.SVG.display) cwidth = this.defaultWidth;
         if (relwidth) {maxwidth = cwidth}
         jax.SVG.ex = ex;
         jax.SVG.em = em = ex / SVG.TeX.x_height * 1000; // scale ex to x_height

Original file line number	Diff line number	Diff line change
`@@ -489,7 +489,7 @@`
`489`	`489`	`ex = this.defaultEx;`
`490`	`490`	`cwidth = this.defaultWidth;`
`491`	`491`	`}`
`492`		`- if (cwidth === 0) cwidth = this.defaultWidth;`
	`492`	`+ if (cwidth === 0 && !jax.CHTML.display) cwidth = this.defaultWidth;`
`493`	`493`	`if (relwidth) maxwidth = cwidth;`
`494`	`494`	`scale = (this.config.matchFontHeight ? ex/this.TEX.x_height/em : 1);`
`495`	`495`	`scale = Math.floor(Math.max(this.config.minScaleAdjust/100,scale)*this.config.scale);`
Original file line number	Diff line number	Diff line change
`@@ -671,7 +671,7 @@`
`671`	`671`	`jax.HTMLCSS.isHidden = true;`
`672`	`672`	`ex = this.defaultEx; em = this.defaultEm; cwidth = this.defaultWidth;`
`673`	`673`	`}`
`674`		`- if (cwidth === 0) cwidth = this.defaultWidth;`
	`674`	`+ if (cwidth === 0 && !jax.HTMLCSS.display) cwidth = this.defaultWidth;`
`675`	`675`	`if (relwidth) {maxwidth = cwidth}`
`676`	`676`	`scale = (this.config.matchFontHeight ? ex/this.TeX.x_height/em : 1);`
`677`	`677`	`scale = Math.floor(Math.max(this.config.minScaleAdjust/100,scale)*this.config.scale);`
Original file line number	Diff line number	Diff line change
`@@ -314,7 +314,7 @@`
`314`	`314`	`jax.SVG.isHidden = true;`
`315`	`315`	`ex = this.defaultEx; cwidth = this.defaultWidth;`
`316`	`316`	`}`
`317`		`- if (cwidth === 0) cwidth = this.defaultWidth;`
	`317`	`+ if (cwidth === 0 && !jax.SVG.display) cwidth = this.defaultWidth;`
`318`	`318`	`if (relwidth) {maxwidth = cwidth}`
`319`	`319`	`jax.SVG.ex = ex;`
`320`	`320`	`jax.SVG.em = em = ex / SVG.TeX.x_height * 1000; // scale ex to x_height`