Merge branch 'issue353' into develop. Issue #353.

This commit is contained in:
Davide P. Cervone 2014-02-15 12:37:52 -05:00
commit 7313af12c2
3 changed files with 14 additions and 0 deletions

View File

@ -584,6 +584,14 @@ MathJax.Hub.Config({
// These parameters control the AsciiMath input jax. // These parameters control the AsciiMath input jax.
// //
AsciiMath: { AsciiMath: {
//
// Determines whether the unicode positions for phi and varphi are
// to be swapped or not. (Unicode originally had these reversed, and
// many fonts have them reversed as well.) When set to true, phi
// and varphi will correspond to the LaTeX macros of the same name.
//
fixphi: true,
// //
// Determines whether limits are placed above and below operators, // Determines whether limits are placed above and below operators,
// or next to them. (AsciiMath doesn't have separate in-line and // or next to them. (AsciiMath doesn't have separate in-line and

View File

@ -35,6 +35,7 @@ MathJax.InputJax.AsciiMath = MathJax.InputJax({
extensionDir: MathJax.InputJax.extensionDir + "/AsciiMath", extensionDir: MathJax.InputJax.extensionDir + "/AsciiMath",
config: { config: {
fixphi: true, // switch phi and varphi unicode values
displaystyle: true, // put limits above and below operators displaystyle: true, // put limits above and below operators
decimalsign: "." // can change to "," but watch out for "(1,2)" decimalsign: "." // can change to "," but watch out for "(1,2)"
} }

View File

@ -1199,6 +1199,11 @@ ASCIIMATH.Augment({
// Old versions use the "decimal" option, so take it into account if it // Old versions use the "decimal" option, so take it into account if it
// is defined by the user. See issue 384. // is defined by the user. See issue 384.
decimalsign = (ASCIIMATH.config.decimal || ASCIIMATH.config.decimalsign); decimalsign = (ASCIIMATH.config.decimal || ASCIIMATH.config.decimalsign);
// fix pi and var phi, if requested
for (var i = 0, m = AMsymbols.length; i < m; i++) {
if (AMsymbols[i].input === "phi") {AMsymbols[i].output = "\u03D5"}
if (AMsymbols[i].input === "varphi") {AMsymbols[i].output = "\u03C6"; i = m}
}
INITASCIIMATH(); INITASCIIMATH();
AMinitSymbols(); AMinitSymbols();
}, },