Compare commits
50 Commits
1a20e6927d
...
master
Author | SHA1 | Date | |
---|---|---|---|
7f8939eab2 | |||
0cadc6734e | |||
f767aa390c | |||
55985bfe20 | |||
41d0de79cc | |||
3b5c01e5cc | |||
73b19e9644 | |||
27e7dcba20 | |||
5f398b4c8d | |||
ec823c85eb | |||
d72a2be175 | |||
e596c1af60 | |||
b84cf047bd | |||
d446139af3 | |||
975728f8dc | |||
2317296534 | |||
c211ed1591 | |||
0c84c63ad3 | |||
25bfb7699b | |||
0abd80655a | |||
a3f7efca12 | |||
1a74c54548 | |||
1dccaabd86 | |||
510f6a1fa2 | |||
6b353d2dd0 | |||
fbfaeb5a58 | |||
1a4e8ffb19 | |||
d6bb61dc48 | |||
02214b0f82 | |||
e52fec4057 | |||
219d923ff5 | |||
419e5955eb | |||
f471a1efb3 | |||
7600962fe4 | |||
3e258b2d41 | |||
9f492378c8 | |||
0c3c20262e | |||
b3ec098b0b | |||
9d9224fcba | |||
b53de690d5 | |||
beb319f21d | |||
50f77c4d60 | |||
a83b5ada8d | |||
0aba5eaef6 | |||
0faaf481ca | |||
b51ac7880d | |||
fdf3b088f2 | |||
c7bd77e341 | |||
37601be549 | |||
19cdddf27e |
@@ -64,10 +64,25 @@ class Token(object):
|
||||
yield self
|
||||
|
||||
def __repr__(self):
|
||||
return f"<{self.__class__.__name__} {renders['txt'](self._mo)}>"
|
||||
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):
|
||||
return self._mo.__txt__
|
||||
|
||||
@property
|
||||
def __tex__(self):
|
||||
return self._mo.__tex__
|
||||
|
||||
@property
|
||||
def raw(self):
|
||||
@@ -250,6 +265,7 @@ class Token(object):
|
||||
"""
|
||||
return self._operate(other, "^")
|
||||
|
||||
|
||||
def _roperate(self, other, operation):
|
||||
""" Make a operation between 2 Tokens """
|
||||
from ..expression import Expression
|
||||
@@ -299,7 +315,6 @@ class Token(object):
|
||||
<Linear x - 3>
|
||||
"""
|
||||
return self._roperate(other, "-")
|
||||
|
||||
def __rmul__(self, other):
|
||||
""" Multiply 2 Tokens or a Token and a Expression
|
||||
|
||||
@@ -327,6 +342,7 @@ class Token(object):
|
||||
"""
|
||||
return self._roperate(other, "/")
|
||||
|
||||
|
||||
def _get_soul(self, other=None):
|
||||
""" Get the builtin soul of self or other """
|
||||
if isinstance(other, Token):
|
||||
|
Reference in New Issue
Block a user