www

commit 42cc8b1a124d6d8227d6dcb1771212465c8baad6
parent 4a3ed8dce00d53f9285c6ceee163ebc453f36a4a
Author: Emily Eisenberg <xymostech@gmail.com>
Date:   Tue,  9 Jul 2013 22:04:33 -0700

Add ops

Summary: Add named functions like \sin, \cos, etc.

Reviewers: spicyj

Reviewed By: spicyj

Differential Revision: http://phabricator.benalpert.com/D51

Diffstat:
M
MJLite.js
 | 
2
++
M
lexer.js
 | 
4
++++
M
parser.jison
 | 
44
++++++++++++++++++++++++++++++++++++++++++++
M
static/mjlite.css
 | 
40
++++++++++++++++++++++++++++++++++++++++

4 files changed, 90 insertions(+), 0 deletions(-)
diff --git a/MJLite.js b/MJLite.js
@@ -90,6 +90,8 @@ var buildGroup = function(group, prev) {
         return makeSpan("mpunct", textit(group.value));
     } else if (group.type === "ordgroup") {
         return makeSpan("mord", buildExpression(group.value));
+    } else if (group.type === "namedfn") {
+        return makeSpan("mop", textit(group.value.slice(1)));
     } else {
         console.log("Unknown type:", group.type);
     }
diff --git a/lexer.js b/lexer.js
@@ -27,6 +27,10 @@ var funcs = [
     'qquad', 'quad', ' ', 'space', ',', ':', ';',
     // Colors
     'blue', 'orange', 'pink', 'red', 'green', 'gray', 'purple',
+    // Mathy functions
+    "arcsin", "arccos", "arctan", "arg", "cos", "cosh", "cot", "coth", "csc",
+    "deg", "dim", "exp", "hom", "ker", "lg", "ln", "log", "sec", "sin", "sinh",
+    "tan", "tanh",
     // Other functions
     'dfrac', 'llap', 'rlap'
 ];
diff --git a/parser.jison b/parser.jison
@@ -96,6 +96,50 @@ func
         {$$ = [{type: 'llap', value: $2}];}
     | 'rlap' group
         {$$ = [{type: 'rlap', value: $2}];}
+    | 'arcsin'
+        {$$ = [{type: 'namedfn', value: yytext}];}
+    | 'arccos'
+        {$$ = [{type: 'namedfn', value: yytext}];}
+    | 'arctan'
+        {$$ = [{type: 'namedfn', value: yytext}];}
+    | 'arg'
+        {$$ = [{type: 'namedfn', value: yytext}];}
+    | 'cos'
+        {$$ = [{type: 'namedfn', value: yytext}];}
+    | 'cosh'
+        {$$ = [{type: 'namedfn', value: yytext}];}
+    | 'cot'
+        {$$ = [{type: 'namedfn', value: yytext}];}
+    | 'coth'
+        {$$ = [{type: 'namedfn', value: yytext}];}
+    | 'csc'
+        {$$ = [{type: 'namedfn', value: yytext}];}
+    | 'deg'
+        {$$ = [{type: 'namedfn', value: yytext}];}
+    | 'dim'
+        {$$ = [{type: 'namedfn', value: yytext}];}
+    | 'exp'
+        {$$ = [{type: 'namedfn', value: yytext}];}
+    | 'hom'
+        {$$ = [{type: 'namedfn', value: yytext}];}
+    | 'ker'
+        {$$ = [{type: 'namedfn', value: yytext}];}
+    | 'lg'
+        {$$ = [{type: 'namedfn', value: yytext}];}
+    | 'ln'
+        {$$ = [{type: 'namedfn', value: yytext}];}
+    | 'log'
+        {$$ = [{type: 'namedfn', value: yytext}];}
+    | 'sec'
+        {$$ = [{type: 'namedfn', value: yytext}];}
+    | 'sin'
+        {$$ = [{type: 'namedfn', value: yytext}];}
+    | 'sinh'
+        {$$ = [{type: 'namedfn', value: yytext}];}
+    | 'tan'
+        {$$ = [{type: 'namedfn', value: yytext}];}
+    | 'tanh'
+        {$$ = [{type: 'namedfn', value: yytext}];}
     ;
 
 atom
diff --git a/static/mjlite.css b/static/mjlite.css
@@ -124,6 +124,46 @@ big parens
     margin-left: 0.16667em;
 }
 
+.mop + .mord {
+    margin-left: 0.16667em;
+}
+
+.mop + .mop {
+    margin-left: 0.16667em;
+}
+
+.mop + .mrel {
+    margin-left: 0.27778em;
+}
+
+.mop + .minner {
+    margin-left: 0.16667em;
+}
+
+.mord + .mop {
+    margin-left: 0.16667em;
+}
+
+.mbin + .mop {
+    margin-left: 0.22222em;
+}
+
+.mrel + .mop {
+    margin-left: 0.27778em;
+}
+
+.mclose + .mop {
+    margin-left: 0.16667em;
+}
+
+.mpunct + .mop {
+    margin-left: 0.16667em;
+}
+
+.minner + .mop {
+    margin-left: 0.16667em;
+}
+
 .msub {
     vertical-align: bottom;
     font-size: 70%;