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

Ignore linebreak attribute on mspace when dimensional attributes are set. Fix issue #388.

Browse Source
This commit is contained in:
Frédéric Wang 2013-03-25 16:57:05 +01:00
parent 96a3bc7d92
commit 8803b00446
3 changed files with 30 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
unpacked/jax/element/mml/jax.js
View File

@ -638,7 +638,16 @@ MathJax.ElementJax.mml.Augment({
depth: "0ex", depth: "0ex",
linebreak: MML.LINEBREAK.AUTO linebreak: MML.LINEBREAK.AUTO
}, },
hasNewline: function () {return (this.Get("linebreak") === MML.LINEBREAK.NEWLINE)} hasDimAttr: function () {
return (this.hasValue("width") || this.hasValue("height") ||
this.hasValue("depth"));
},
hasNewline: function () {
// The MathML spec says that the linebreak attribute should be ignored
// if any dimensional attribute is set.
return (!this.hasDimAttr() &&
this.Get("linebreak") === MML.LINEBREAK.NEWLINE);
}
}); });
MML.ms = MML.mbase.Subclass({ MML.ms = MML.mbase.Subclass({

12
unpacked/jax/output/HTML-CSS/autoload/multiline.js
View File

@ -1,3 +1,5 @@
/* -*- Mode: Javascript; indent-tabs-mode:nil; js-indent-level: 2 -*- */
/* vim: set ts=2 et sw=2 tw=80: */
/************************************************************* /*************************************************************
* *
* MathJax/jax/output/HTML-CSS/autoload/multiline.js * MathJax/jax/output/HTML-CSS/autoload/multiline.js
@ -594,6 +596,12 @@ MathJax.Hub.Register.StartupHook("HTML-CSS Jax Ready",function () {
HTMLbetterBreak: function (info,state) { HTMLbetterBreak: function (info,state) {
if (info.values && info.values.id === this.spanID) {return false} if (info.values && info.values.id === this.spanID) {return false}
var values = this.getValues("linebreak"); var values = this.getValues("linebreak");
var linebreakValue = values.linebreak;
if (!linebreakValue || this.hasDimAttr()) {
// The MathML spec says that the linebreak attribute should be ignored
// if any dimensional attribute is set.
linebreakValue = MML.LINEBREAK.AUTO;
}
// //
// Get the default penalty for this location // Get the default penalty for this location
// //
@ -609,8 +617,8 @@ MathJax.Hub.Register.StartupHook("HTML-CSS Jax Ready",function () {
// Get the penalty for this type of break and // Get the penalty for this type of break and
// use it to modify the default penalty // use it to modify the default penalty
// //
var linebreak = PENALTY[values.linebreak||MML.LINEBREAK.AUTO]; var linebreak = PENALTY[linebreakValue];
if (values.linebreak === MML.LINEBREAK.AUTO && w >= PENALTY.spacelimit) if (linebreakValue === MML.LINEBREAK.AUTO && w >= PENALTY.spacelimit)
{linebreak = [(w+PENALTY.spaceoffset)*PENALTY.spacefactor]} {linebreak = [(w+PENALTY.spaceoffset)*PENALTY.spacefactor]}
if (!(linebreak instanceof Array)) { if (!(linebreak instanceof Array)) {
// for breaks past the width, don't modify penalty // for breaks past the width, don't modify penalty

12
unpacked/jax/output/SVG/autoload/multiline.js
View File

@ -1,3 +1,5 @@
/* -*- Mode: Javascript; indent-tabs-mode:nil; js-indent-level: 2 -*- */
/* vim: set ts=2 et sw=2 tw=80: */
/************************************************************* /*************************************************************
* *
* MathJax/jax/output/SVG/autoload/multiline.js * MathJax/jax/output/SVG/autoload/multiline.js
@ -541,6 +543,12 @@ MathJax.Hub.Register.StartupHook("SVG Jax Ready",function () {
SVGbetterBreak: function (info,state) { SVGbetterBreak: function (info,state) {
if (info.values && info.values.last === this) {return false} if (info.values && info.values.last === this) {return false}
var values = this.getValues("linebreak"); var values = this.getValues("linebreak");
var linebreakValue = values.linebreak;
if (!linebreakValue || this.hasDimAttr()) {
// The MathML spec says that the linebreak attribute should be ignored
// if any dimensional attribute is set.
linebreakValue = MML.LINEBREAK.AUTO;
}
// //
// Get the default penalty for this location // Get the default penalty for this location
// //
@ -555,8 +563,8 @@ MathJax.Hub.Register.StartupHook("SVG Jax Ready",function () {
// Get the penalty for this type of break and // Get the penalty for this type of break and
// use it to modify the default penalty // use it to modify the default penalty
// //
var linebreak = PENALTY[values.linebreak||MML.LINEBREAK.AUTO]; var linebreak = PENALTY[linebreakValue];
if (values.linebreak === MML.LINEBREAK.AUTO && w >= PENALTY.spacelimit*1000) if (linebreakValue === MML.LINEBREAK.AUTO && w >= PENALTY.spacelimit*1000)
{linebreak = [(w+PENALTY.spaceoffset)*PENALTY.spacefactor]} {linebreak = [(w+PENALTY.spaceoffset)*PENALTY.spacefactor]}
if (!(linebreak instanceof Array)) { if (!(linebreak instanceof Array)) {
// for breaks past the width, don't modify penalty // for breaks past the width, don't modify penalty