Pass the printer into the _str and _latex_str methods

This means the printer can now have non-global state.
This fixes a todo in the source code.

Author: eric-wieser

galgebra/dop.py

@@ -116,7 +116,7 @@ def _with_sorted_terms(self):
         new_terms = sorted(self.terms, key=lambda term: Pdop.sort_key(term[1]))
         return Sdop(new_terms)
 
-    def Sdop_str(self):
+    def Sdop_str(self, print_obj):
         if len(self.terms) == 0:
             return ZERO_STR
 
@@ -144,7 +144,7 @@ def Sdop_str(self):
                 s = '(' + s + ')'
         return s
 
-    def Sdop_latex_str(self):
+    def Sdop_latex_str(self, print_obj):
         if len(self.terms) == 0:
             return ZERO_STR
 
@@ -378,7 +378,7 @@ def __rmul__(self, other):  # functional product of arg and self (arg*self)
         assert not isinstance(other, Pdop)
         return Sdop([(other, self)])
 
-    def Pdop_str(self):
+    def Pdop_str(self, print_obj):
         if self.order == 0:
             return 'D{}'
         s = 'D'
@@ -389,7 +389,7 @@ def Pdop_str(self):
                 s += '^' + str(n)
         return s
 
-    def Pdop_latex_str(self):
+    def Pdop_latex_str(self, print_obj):
         if self.order == 0:
             return ''
         s = r'\frac{\partial'

galgebra/lt.py

@@ -389,7 +389,7 @@ def inv(self):
             raise ValueError('Lt inverse currently implemented only for spinor!\n')
         return Lt_inv
 
-    def Lt_str(self):
+    def Lt_str(self, print_obj):
 
         if self.spinor:
             return 'R = ' + str(self.R)
@@ -403,7 +403,7 @@ def Lt_str(self):
                     s += pre + str(base) + ') = 0\n'
             return s[:-1]
 
-    def Lt_latex_str(self):
+    def Lt_latex_str(self, print_obj):
 
         if self.spinor:
             s = '\\left \\{ \\begin{array}{ll} '
@@ -586,10 +586,10 @@ def extact_basis_indexes(Ga):
                 base_indexes.append(base_str[i:])
         return base_indexes
 
-    def Mlt_str(self):
+    def Mlt_str(self, print_obj):
         return str(self.fvalue)
 
-    def Mlt_latex_str(self):
+    def Mlt_latex_str(self, print_obj):
         if self.nargs <= 1:
             return printer.latex(self.fvalue)
         expr_lst = Mlt.expand_expr(self.fvalue, self.Ga)

galgebra/mv.py

@@ -583,10 +583,7 @@ def __getitem__(self, key):
         '''
         return self.grade(key)
 
-    def Mv_str(self):
-        # todo: make this an argument?
-        print_obj = printer.GaPrinter()
-
+    def Mv_str(self, print_obj):
         global print_replace_old, print_replace_new
         if self.i_grade == 0:
             return print_obj.doprint(self.obj)
@@ -654,7 +651,7 @@ def Mv_str(self):
         else:
             return print_obj.doprint(self.obj)
 
-    def Mv_latex_str(self):
+    def Mv_latex_str(self, print_obj):
 
         if self.obj == 0:
             return ZERO_STR
@@ -1719,7 +1716,7 @@ def Dop_mv_expand(self, modes=None):
         terms = list(zip(coefs, bases))
         return sorted(terms, key=lambda x: self.Ga.blades.flat.index(x[1]))
 
-    def Dop_str(self):
+    def Dop_str(self, print_obj):
         if len(self.terms) == 0:
             return ZERO_STR
 
@@ -1753,7 +1750,7 @@ def Dop_str(self):
         s = s.replace('+ -', '-')
         return s[:-3]
 
-    def Dop_latex_str(self):
+    def Dop_latex_str(self, print_obj):
         if len(self.terms) == 0:
             return ZERO_STR
 

galgebra/printer.py

@@ -372,22 +372,22 @@ def _print_Mv(self, expr):
         if expr.obj == S(0):
             return ZERO_STR
         else:
-            return expr.Mv_str()
+            return expr.Mv_str(self)
 
     def _print_Pdop(self, expr):
-        return expr.Pdop_str()
+        return expr.Pdop_str(self)
 
     def _print_Dop(self, expr):
-        return expr.Dop_str()
+        return expr.Dop_str(self)
 
     def _print_Sdop(self, expr):
-        return expr.Sdop_str()
+        return expr.Sdop_str(self)
 
     def _print_Lt(self, expr):
-        return expr.Lt_str()
+        return expr.Lt_str(self)
 
     def _print_Mlt(self, expr):
-        return expr.Mlt_str()
+        return expr.Mlt_str(self)
 
 
 Basic.__str__ = lambda self: GaPrinter().doprint(self)