transformers refactoring latex i substitution

idanpa · Mar 8, 2024 · 7055c02 · 7055c02
1 parent 55df0bd
commit 7055c02
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 2 deletions.
diff --git a/calcpy/tests/test_transformers.py b/calcpy/tests/test_transformers.py
@@ -1,4 +1,4 @@
-from sympy import symbols
+from sympy import symbols, I
 from datetime import datetime
 
 def test_autodate(ip):
@@ -47,8 +47,10 @@ def test_auto_latex(ip):
     assert ip.run_cell('$x+y$ == x+y').result == True
     ip.run_cell('a,b = 3,4')
     assert ip.run_cell('$a+b$').result == 7
+    assert ip.run_cell('$i$').result == I
     ip.calcpy.auto_latex_sub = False
     assert ip.run_cell('$a+b$').result == symbols('a') + symbols('b')
+    assert ip.run_cell('$i$').result == I
 
 def test_auto_symbols(ip):
     assert ip.run_cell('x+y_1+z2').result == symbols('x')+symbols('y_1')+symbols('z2')

diff --git a/calcpy/transformers.py b/calcpy/transformers.py
@@ -30,6 +30,7 @@ def dateparse(datetime_string):
 def parse_latex(s):
     ip = IPython.get_ipython()
     expr = sympy.parsing.latex.parse_latex(s)
+    expr = expr.subs({'i': sympy.I})
     if not ip.calcpy.auto_latex_sub:
         return expr
     subs = {sym.name : ip.user_ns.get(sym.name,sympy.symbols(sym.name)) for sym in expr.free_symbols}
@@ -74,7 +75,7 @@ def raw_code_transformer(code):
         for m in re.finditer(latex_pattern, code):
             key = hash(m.group())
             code = code.replace(m.group(), f'({key})')
-            latex_matches[key] = f'parse_latex(r"""{m[1]}""").subs({{symbols("i"):sympy.I}})'
+            latex_matches[key] = f'parse_latex(r"""{m[1]}""")'
 
     code = code.replace('⋅','*')
     code = code.replace('ⅈ','i') # for auto product to detect it