From 63de956a4f9537218f285fd49a03879e522d5b18 Mon Sep 17 00:00:00 2001 From: Bertrand Benjamin Date: Thu, 11 Jul 2019 18:03:49 +0200 Subject: [PATCH] Fix: subtree render for tex --- mapytex/calculus/API/tokens/token.py | 9 ++++++++- mapytex/calculus/core/renders/tree2tex.py | 2 +- 2 files changed, 9 insertions(+), 2 deletions(-) diff --git a/mapytex/calculus/API/tokens/token.py b/mapytex/calculus/API/tokens/token.py index da647e1..435cbbe 100644 --- a/mapytex/calculus/API/tokens/token.py +++ b/mapytex/calculus/API/tokens/token.py @@ -62,7 +62,14 @@ class Token(object): return f"<{self.__class__.__name__} {self.__txt__}>" def __str__(self): - return renders[self.RENDER](self._mo) + if self.RENDER == "tex": + return self.__tex__ + elif self.RENDER == "txt": + return self.__txt__ + else: + raise ValueError(f"Unknow render {self.RENDER}") + + #return renders[self.RENDER](self._mo) @property def __txt__(self): diff --git a/mapytex/calculus/core/renders/tree2tex.py b/mapytex/calculus/core/renders/tree2tex.py index 651912c..840fd81 100644 --- a/mapytex/calculus/core/renders/tree2tex.py +++ b/mapytex/calculus/core/renders/tree2tex.py @@ -196,7 +196,7 @@ def render_with_parenthesis(subtree, operator): subtree_need_parenthesis = True except (AttributeError, KeyError): pass - subtree_ = subtree.__txt__ + subtree_ = subtree.__tex__ else: if OPERATORS[subtree.node]["precedence"] < OPERATORS[operator]["precedence"]: subtree_need_parenthesis = True