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

Allow negative dimensions for \\[] but clip to 0 since this isn't really allowed in MathML. I will need to figure out something better for the future, but for now this will prevent the error message. Issue #236.

Browse Source
This commit is contained in:
Davide P. Cervone 2012-09-08 15:31:07 -04:00
parent 0ed5d463e5
commit 983dd18b69
3 changed files with 17 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
unpacked/extensions/TeX/AMSmath.js
View File

@ -22,7 +22,7 @@
*/ */
MathJax.Extension["TeX/AMSmath"] = { MathJax.Extension["TeX/AMSmath"] = {
version: "2.0.2", version: "2.0.3",
number: 0, // current equation number number: 0, // current equation number
startNumber: 0, // current starting equation number (for when equation is restarted) startNumber: 0, // current starting equation number (for when equation is restarted)
@ -41,7 +41,12 @@ MathJax.Hub.Register.StartupHook("TeX Jax Ready",function () {
STACKITEM = TEX.Stack.Item, STACKITEM = TEX.Stack.Item,
CONFIG = TEX.config.equationNumbers; CONFIG = TEX.config.equationNumbers;
var COLS = function (W) {return W.join("em ") + "em"}; var COLS = function (W) {
var WW = [];
for (var i = 0, m = W.length; i < m; i++)
{WW[i] = TEX.Parse.prototype.Em(W[i])}
return WW.join(" ");
};
/******************************************************************************/ /******************************************************************************/

2
unpacked/jax/input/TeX/config.js
View File

@ -24,7 +24,7 @@
MathJax.InputJax.TeX = MathJax.InputJax({ MathJax.InputJax.TeX = MathJax.InputJax({
id: "TeX", id: "TeX",
version: "2.0.6", version: "2.0.7",
directory: MathJax.InputJax.directory + "/TeX", directory: MathJax.InputJax.directory + "/TeX",
extensionDir: MathJax.InputJax.extensionDir + "/TeX", extensionDir: MathJax.InputJax.extensionDir + "/TeX",

14
unpacked/jax/input/TeX/jax.js
View File

@ -296,7 +296,7 @@
} }
if (this.rowspacing) { if (this.rowspacing) {
var rows = this.arraydef.rowspacing.split(/ /); var rows = this.arraydef.rowspacing.split(/ /);
while (rows.length < this.table.length) {rows.push(this.rowspacing)} while (rows.length < this.table.length) {rows.push(this.rowspacing+"em")}
this.arraydef.rowspacing = rows.join(' '); this.arraydef.rowspacing = rows.join(' ');
} }
}, },
@ -1613,7 +1613,7 @@
var n; var n;
if (this.string.charAt(this.i) === "[") { if (this.string.charAt(this.i) === "[") {
n = this.GetBrackets(name,"").replace(/ /g,""); n = this.GetBrackets(name,"").replace(/ /g,"");
if (n && !n.match(/^(((\.\d+|\d+(\.\d*)?))(pt|em|ex|mu|mm|cm|in|pc))$/)) if (n && !n.match(/^((-?(\.\d+|\d+(\.\d*)?))(pt|em|ex|mu|mm|cm|in|pc))$/))
{TEX.Error("Bracket argument to "+name+" must be a dimension")} {TEX.Error("Bracket argument to "+name+" must be a dimension")}
} }
this.Push(STACKITEM.cell().With({isCR: true, name: name, linebreak: true})); this.Push(STACKITEM.cell().With({isCR: true, name: name, linebreak: true}));
@ -1622,8 +1622,8 @@
if (n && top.arraydef.rowspacing) { if (n && top.arraydef.rowspacing) {
var rows = top.arraydef.rowspacing.split(/ /); var rows = top.arraydef.rowspacing.split(/ /);
if (!top.rowspacing) {top.rowspacing = this.dimen2em(rows[0])} if (!top.rowspacing) {top.rowspacing = this.dimen2em(rows[0])}
while (rows.length < top.table.length) {rows.push(top.rowspacing)} while (rows.length < top.table.length) {rows.push(this.Em(top.rowspacing))}
rows[top.table.length-1] = (top.rowspacing+this.dimen2em(n)) + "em"; rows[top.table.length-1] = this.Em(Math.max(0,top.rowspacing+this.dimen2em(n)));
top.arraydef.rowspacing = rows.join(' '); top.arraydef.rowspacing = rows.join(' ');
} }
} else { } else {
@ -1633,7 +1633,7 @@
}, },
emPerInch: 7.2, emPerInch: 7.2,
dimen2em: function (dim) { dimen2em: function (dim) {
var match = dim.match(/^((?:\.\d+|\d+(?:\.\d*)?))(pt|em|ex|mu|pc|in|mm|cm)/); var match = dim.match(/^(-?(?:\.\d+|\d+(?:\.\d*)?))(pt|em|ex|mu|pc|in|mm|cm)/);
var m = parseFloat(match[1]||"1"), unit = match[2]; var m = parseFloat(match[1]||"1"), unit = match[2];
if (unit === "em") {return m} if (unit === "em") {return m}
if (unit === "ex") {return m * .43} if (unit === "ex") {return m * .43}
@ -1645,6 +1645,10 @@
if (unit === "mu") {return m / 18} if (unit === "mu") {return m / 18}
return 0; return 0;
}, },
Em: function (m) {
if (Math.abs(m) < .0006) {return "0em"}
return m.toFixed(3).replace(/\.?0+$/,"") + "em";
},
HLine: function (name,style) { HLine: function (name,style) {
if (style == null) {style = "solid"} if (style == null) {style = "solid"}