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

Improve linebreaking to work better when the equation doesn't have nesting to help group terms that shouldn't be broken. Also make breaks at large spaces more desireable.

Browse Source
This commit is contained in:
Davide P. Cervone 2012-02-08 17:37:07 -05:00
parent ac512fd1a7
commit 5968ef8b74
4 changed files with 31 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

File diff suppressed because one or more lines are too long

2
jax/output/SVG/autoload/multiline.js
View File

File diff suppressed because one or more lines are too long

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

@ -38,6 +38,9 @@ MathJax.Hub.Register.StartupHook("HTML-CSS Jax Ready",function () {
toobig: 500,
nestfactor: 400,
spacefactor: -100,
spaceoffset: 2,
spacelimit: 1, // spaces larger than this get a penalty boost
fence: 500
};
@ -374,11 +377,18 @@ MathJax.Hub.Register.StartupHook("HTML-CSS Jax Ready",function () {
"linebreak","linebreakstyle","lineleading","linebreakmultchar",
"indentalign","indentshift",
"indentalignfirst","indentshiftfirst",
"indentalignlast","indentshiftlast"
"indentalignlast","indentshiftlast",
"texClass", "fence"
);
if (values.linebreakstyle === MML.LINEBREAKSTYLE.INFIXLINEBREAKSTYLE)
{values.linebreakstyle = this.Get("infixlinebreakstyle")}
//
// Adjust nesting by TeX class (helps output that does not include
// mrows for nesting, but can leave these unbalanced.
//
if (values.texClass === MML.TEXCLASS.OPEN) {info.nest++}
if (values.texClass === MML.TEXCLASS.CLOSE) {info.nest--}
//
// Get the default penalty for this location
//
var W = info.W, mo = (info.embellished||this); delete info.embellished;
@ -387,7 +397,7 @@ MathJax.Hub.Register.StartupHook("HTML-CSS Jax Ready",function () {
if (values.linebreakstyle === MML.LINEBREAKSTYLE.AFTER) {W += w; w = 0}
if (W - info.shift === 0) {return false} // don't break at zero width (FIXME?)
var offset = HTMLCSS.linebreakWidth - W;
// adjust offest for explicit first-line indent and align
// Adjust offest for explicit first-line indent and align
if (state.n === 0 && (values.indentshiftfirst !== state.VALUES.indentshiftfirst ||
values.indentalignfirst !== state.VALUES.indentalignfirst)) {
var align = this.HTMLgetAlign(state,values),
@ -397,7 +407,7 @@ MathJax.Hub.Register.StartupHook("HTML-CSS Jax Ready",function () {
//
var penalty = Math.floor(offset / HTMLCSS.linebreakWidth * 1000);
if (penalty < 0) {penalty = PENALTY.toobig - 3*penalty}
if (this.Get("fence")) {penalty += PENALTY.fence}
if (values.fence) {penalty += PENALTY.fence}
penalty += info.nest * PENALTY.nestfactor;
//
// Get the penalty for this type of break and
@ -444,6 +454,8 @@ MathJax.Hub.Register.StartupHook("HTML-CSS Jax Ready",function () {
// use it to modify the default penalty
//
var linebreak = PENALTY[values.linebreak||MML.LINEBREAK.AUTO];
if (values.linebreak === MML.LINEBREAK.AUTO && w >= PENALTY.spacelimit)
{linebreak = [(w+PENALTY.spaceoffset)*PENALTY.spacefactor]}
if (!(linebreak instanceof Array)) {
// for breaks past the width, don't modify penalty
if (offset >= 0) {penalty = linebreak * info.nest}

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

@ -39,6 +39,9 @@ MathJax.Hub.Register.StartupHook("SVG Jax Ready",function () {
toobig: 500,
nestfactor: 400,
spacefactor: -100,
spaceoffset: 2,
spacelimit: 1, // spaces larger than this get a penalty boost
fence: 500
};
@ -332,11 +335,18 @@ MathJax.Hub.Register.StartupHook("SVG Jax Ready",function () {
"linebreak","linebreakstyle","lineleading","linebreakmultchar",
"indentalign","indentshift",
"indentalignfirst","indentshiftfirst",
"indentalignlast","indentshiftlast"
"indentalignlast","indentshiftlast",
"texClass", "fence"
);
if (values.linebreakstyle === MML.LINEBREAKSTYLE.INFIXLINEBREAKSTYLE)
{values.linebreakstyle = this.Get("infixlinebreakstyle")}
//
// Adjust nesting by TeX class (helps output that does not include
// mrows for nesting, but can leave these unbalanced.
//
if (values.texClass === MML.TEXCLASS.OPEN) {info.nest++}
if (values.texClass === MML.TEXCLASS.CLOSE) {info.nest--}
//
// Get the default penalty for this location
//
var W = info.W, mo = (info.embellished||this); delete info.embellished;
@ -354,7 +364,7 @@ MathJax.Hub.Register.StartupHook("SVG Jax Ready",function () {
//
var penalty = Math.floor(offset / SVG.linebreakWidth * 1000);
if (penalty < 0) {penalty = PENALTY.toobig - 3*penalty}
if (this.Get("fence")) {penalty += PENALTY.fence}
if (values.fence) {penalty += PENALTY.fence}
penalty += info.nest * PENALTY.nestfactor;
//
// Get the penalty for this type of break and
@ -400,6 +410,8 @@ MathJax.Hub.Register.StartupHook("SVG Jax Ready",function () {
// use it to modify the default penalty
//
var linebreak = PENALTY[values.linebreak||MML.LINEBREAK.AUTO];
if (values.linebreak === MML.LINEBREAK.AUTO && w >= PENALTY.spacelimit)
{linebreak = [(w+PENALTY.spaceoffset)*PENALTY.spacefactor]}
if (!(linebreak instanceof Array)) {
// for breaks past the width, don't modify penalty
if (offset >= 0) {penalty = linebreak * info.nest}