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

Don't combine mathvariant and fontstyle or fontweight (Fred pointed out this isn't supposed to happen)

Browse Source
This commit is contained in:
Davide P. Cervone 2012-01-12 18:54:57 -05:00
parent af2cd3476f
commit 266360e9d2
8 changed files with 67 additions and 63 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
config/Accessible-full.js
View File

File diff suppressed because one or more lines are too long

2
config/MML_HTMLorMML-full.js
View File

File diff suppressed because one or more lines are too long

2
config/TeX-AMS-MML_HTMLorMML-full.js
View File

File diff suppressed because one or more lines are too long

2
config/TeX-AMS_HTML-full.js
View File

File diff suppressed because one or more lines are too long

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

File diff suppressed because one or more lines are too long

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

File diff suppressed because one or more lines are too long

60
unpacked/jax/output/HTML-CSS/jax.js
View File

@ -1728,35 +1728,37 @@
return {FONTS:[], fonts:[], noRemap:true, return {FONTS:[], fonts:[], noRemap:true,
defaultFont: {family:values.fontfamily, style:values.fontstyle, weight:values.fontweight}}; defaultFont: {family:values.fontfamily, style:values.fontstyle, weight:values.fontweight}};
} }
if (values.fontweight === "bold") { if (!this.mathvariant) {
variant = { if (values.fontweight === "bold") {
normal:MML.VARIANT.BOLD, italic:MML.VARIANT.BOLDITALIC, variant = {
fraktur:MML.VARIANT.BOLDFRAKTUR, script:MML.VARIANT.BOLDSCRIPT, normal:MML.VARIANT.BOLD, italic:MML.VARIANT.BOLDITALIC,
"sans-serif":MML.VARIANT.BOLDSANSSERIF, fraktur:MML.VARIANT.BOLDFRAKTUR, script:MML.VARIANT.BOLDSCRIPT,
"sans-serif-italic":MML.VARIANT.SANSSERIFBOLDITALIC "sans-serif":MML.VARIANT.BOLDSANSSERIF,
}[variant]||variant; "sans-serif-italic":MML.VARIANT.SANSSERIFBOLDITALIC
} else if (values.fontweight === "normal") { }[variant]||variant;
variant = { } else if (values.fontweight === "normal") {
bold:MML.VARIANT.normal, "bold-italic":MML.VARIANT.ITALIC, variant = {
"bold-fraktur":MML.VARIANT.FRAKTUR, "bold-script":MML.VARIANT.SCRIPT, bold:MML.VARIANT.normal, "bold-italic":MML.VARIANT.ITALIC,
"bold-sans-serif":MML.VARIANT.SANSSERIF, "bold-fraktur":MML.VARIANT.FRAKTUR, "bold-script":MML.VARIANT.SCRIPT,
"sans-serif-bold-italic":MML.VARIANT.SANSSERIFITALIC "bold-sans-serif":MML.VARIANT.SANSSERIF,
}[variant]||variant; "sans-serif-bold-italic":MML.VARIANT.SANSSERIFITALIC
} }[variant]||variant;
if (values.fontstyle === "italic") { }
variant = { if (values.fontstyle === "italic") {
normal:MML.VARIANT.ITALIC, bold:MML.VARIANT.BOLDITALIC, variant = {
"sans-serif":MML.VARIANT.SANSSERIFITALIC, normal:MML.VARIANT.ITALIC, bold:MML.VARIANT.BOLDITALIC,
"bold-sans-serif":MML.VARIANT.SANSSERIFBOLDITALIC "sans-serif":MML.VARIANT.SANSSERIFITALIC,
}[variant]||variant; "bold-sans-serif":MML.VARIANT.SANSSERIFBOLDITALIC
} else if (values.fontstyle === "normal") { }[variant]||variant;
variant = { } else if (values.fontstyle === "normal") {
italic:MML.VARIANT.NORMAL, "bold-italic":MML.VARIANT.BOLD, variant = {
"sans-serif-italic":MML.VARIANT.SANSSERIF, italic:MML.VARIANT.NORMAL, "bold-italic":MML.VARIANT.BOLD,
"sans-serif-bold-italic":MML.VARIANT.BOLDSANSSERIF "sans-serif-italic":MML.VARIANT.SANSSERIF,
}[variant]||variant; "sans-serif-bold-italic":MML.VARIANT.BOLDSANSSERIF
} }[variant]||variant;
return HTMLCSS.FONTDATA.VARIANT[variant]; }
}
return HTMLCSS.FONTDATA.VARIANT[variant];
} }
},{ },{
HTMLautoload: function () { HTMLautoload: function () {

58
unpacked/jax/output/SVG/jax.js
View File

@ -1105,34 +1105,36 @@
if (values.fontweight) {variant.font["font-weight"] = values.fontweight} if (values.fontweight) {variant.font["font-weight"] = values.fontweight}
return variant; return variant;
} }
if (values.fontweight === "bold") { if (!this.mathvariant) {
variant = { if (values.fontweight === "bold") {
normal:MML.VARIANT.BOLD, italic:MML.VARIANT.BOLDITALIC, variant = {
fraktur:MML.VARIANT.BOLDFRAKTUR, script:MML.VARIANT.BOLDSCRIPT, normal:MML.VARIANT.BOLD, italic:MML.VARIANT.BOLDITALIC,
"sans-serif":MML.VARIANT.BOLDSANSSERIF, fraktur:MML.VARIANT.BOLDFRAKTUR, script:MML.VARIANT.BOLDSCRIPT,
"sans-serif-italic":MML.VARIANT.SANSSERIFBOLDITALIC "sans-serif":MML.VARIANT.BOLDSANSSERIF,
}[variant]||variant; "sans-serif-italic":MML.VARIANT.SANSSERIFBOLDITALIC
} else if (values.fontweight === "normal") { }[variant]||variant;
variant = { } else if (values.fontweight === "normal") {
bold:MML.VARIANT.normal, "bold-italic":MML.VARIANT.ITALIC, variant = {
"bold-fraktur":MML.VARIANT.FRAKTUR, "bold-script":MML.VARIANT.SCRIPT, bold:MML.VARIANT.normal, "bold-italic":MML.VARIANT.ITALIC,
"bold-sans-serif":MML.VARIANT.SANSSERIF, "bold-fraktur":MML.VARIANT.FRAKTUR, "bold-script":MML.VARIANT.SCRIPT,
"sans-serif-bold-italic":MML.VARIANT.SANSSERIFITALIC "bold-sans-serif":MML.VARIANT.SANSSERIF,
}[variant]||variant; "sans-serif-bold-italic":MML.VARIANT.SANSSERIFITALIC
} }[variant]||variant;
if (values.fontstyle === "italic") { }
variant = { if (values.fontstyle === "italic") {
normal:MML.VARIANT.ITALIC, bold:MML.VARIANT.BOLDITALIC, variant = {
"sans-serif":MML.VARIANT.SANSSERIFITALIC, normal:MML.VARIANT.ITALIC, bold:MML.VARIANT.BOLDITALIC,
"bold-sans-serif":MML.VARIANT.SANSSERIFBOLDITALIC "sans-serif":MML.VARIANT.SANSSERIFITALIC,
}[variant]||variant; "bold-sans-serif":MML.VARIANT.SANSSERIFBOLDITALIC
} else if (values.fontstyle === "normal") { }[variant]||variant;
variant = { } else if (values.fontstyle === "normal") {
italic:MML.VARIANT.NORMAL, "bold-italic":MML.VARIANT.BOLD, variant = {
"sans-serif-italic":MML.VARIANT.SANSSERIF, italic:MML.VARIANT.NORMAL, "bold-italic":MML.VARIANT.BOLD,
"sans-serif-bold-italic":MML.VARIANT.BOLDSANSSERIF "sans-serif-italic":MML.VARIANT.SANSSERIF,
}[variant]||variant; "sans-serif-bold-italic":MML.VARIANT.BOLDSANSSERIF
} }[variant]||variant;
}
}
return SVG.FONTDATA.VARIANT[variant]; return SVG.FONTDATA.VARIANT[variant];
}, },