diff --git a/MJLite.js b/MJLite.js index 270ff1ae2..4656b84ec 100644 --- a/MJLite.js +++ b/MJLite.js @@ -51,8 +51,8 @@ var buildGroup = function(group, prev) { return makeSpan("mopen", textit(group.value)); } else if (group.type === "close") { return makeSpan("mclose", textit(group.value)); - } else if (group.type === "frac") { - var numer = makeSpan("mfracnum", buildExpression(group.value.numer, numer)); + } else if (group.type === "dfrac") { + var numer = makeSpan("mfracnum", makeSpan("", buildExpression(group.value.numer, numer))); var mid = makeSpan("mfracmid", makeSpan()); var denom = makeSpan("mfracden", buildExpression(group.value.denom, denom)); diff --git a/lexer.js b/lexer.js index b66c8293c..0606cdcac 100644 --- a/lexer.js +++ b/lexer.js @@ -13,7 +13,7 @@ var normals = [ ]; var funcs = [ - 'cdot', 'frac', 'lvert', 'rvert', 'pm', 'div' + 'cdot', 'dfrac', 'lvert', 'rvert', 'pm', 'div' ]; var anyFunc = new RegExp("^\\\\(" + funcs.join("|") + ")(?![a-zA-Z])"); diff --git a/parser.jison b/parser.jison index e6232b222..2239310b4 100644 --- a/parser.jison +++ b/parser.jison @@ -48,8 +48,8 @@ func {$$ = [{type: 'bin', value: yytext}];} | 'div' {$$ = [{type: 'bin', value: yytext}];} - | 'frac' group group - {$$ = [{type: 'frac', value: {numer: $2, denom: $3}}];} + | 'dfrac' group group + {$$ = [{type: 'dfrac', value: {numer: $2, denom: $3}}];} | 'lvert' {$$ = [{type: 'open', value: yytext}];} | 'rvert' diff --git a/static/style.css b/static/style.css index e06853c18..07ef6a846 100644 --- a/static/style.css +++ b/static/style.css @@ -104,3 +104,8 @@ input { height: 0.05em; min-height: 1px; } + +.mfracnum > span { + display: inline-block; + vertical-align: bottom; +}