LaTex Parsing for /frac

tests/test_io.py

@@ -1,6 +1,6 @@
 from visma.io.checks import getVariables, areTokensEqual, isTokenInToken
 from visma.io.parser import tokensToString
-from visma.io.tokenize import getTerms
+from visma.io.tokenize import getTerms, normalize
 from visma.functions.operator import Operator, Plus
 from visma.functions.structure import Expression
 from tests.tester import getTokens
@@ -101,3 +101,10 @@ def test_getTerms():
 
     assert getTerms("[1,0;0,1]") == ['[', '1', ',', '0', ';', '0', ',', '1', ']']
     assert getTerms("2*[2,3;2,3]+[1,2;1,2]") == ['2', '*', '[', '2', ',', '3', ';', '2', ',', '3', ']', '+', '[', '1', ',', '2', ';', '1', ',', '2', ']']
+
+    assert getTerms(r"$\frac {3}{x}-\frac{x}{y}$") == ['frac', '{', '3', '}', '{', 'x', '}', '-', 'frac', '{', 'x', '}', '{', 'y', '}']
+
+
+def test_normalize():
+
+    assert normalize(['frac', '{', '3', '}', '{', 'x', '}', '-', 'frac', '{', 'x', '}', '{', 'y', '}']) == ['3', '/', 'x', '-', 'x', '/', 'y']

visma/io/tokenize.py

@@ -172,6 +172,19 @@ def getTerms(eqn):
                     continue
                 terms.append(eqn[x])
 
+            elif eqn[x] == 'f':
+                i = x
+                buf = eqn[x]
+                while (i - x) < len("rac"):
+                    i += 1
+                    if i < len(eqn):
+                        buf += eqn[i]
+                if buf == "frac":
+                    terms.append(buf)
+                    x = i + 1
+                    continue
+                terms.append(eqn[x])
+
             elif eqn[x] == 'e':
                 terms.append('exp')
 
@@ -331,10 +344,22 @@ def normalize(terms):
     Returns:
         terms {list} -- Greek input terms
     """
-    for term in terms:
+    for index, term in enumerate(terms):
         for i, x in enumerate(inputLaTeX):
             if x == term:
                 term = inputGreek[i]
+        if term == 'frac':
+            terms.remove(terms[index])
+            terms.remove(terms[index])
+            j = index
+            while terms[j] is not '}':
+                j += 1
+            terms.remove(terms[j])
+            terms.insert(j, '/')
+            terms.remove(terms[j+1])
+            while terms[j] is not '}':
+                j += 1
+            terms.remove(terms[j])
     return terms