87 lines
4.7 KiB
Diff
87 lines
4.7 KiB
Diff
--- ./sympy/physics/vector/tests/test_printing.py.orig 2014-02-22 12:13:32.000000000 -0700
|
|
+++ ./sympy/physics/vector/tests/test_printing.py 2014-03-14 15:34:37.122395476 -0600
|
|
@@ -1,4 +1,4 @@
|
|
-from sympy import symbols, sin, cos, sqrt, Function
|
|
+from sympy import symbols, sin, cos, sqrt, Function, pprint_use_unicode
|
|
from sympy.core.compatibility import u
|
|
from sympy.physics.vector import ReferenceFrame, dynamicsymbols
|
|
from sympy.physics.vector.printing import (VectorPrettyPrinter,
|
|
@@ -35,16 +35,26 @@ def test_vector_pretty_print():
|
|
|
|
pp = VectorPrettyPrinter()
|
|
|
|
- expected = u(' 2\na \x1b[94m\x1b[1mn_x\x1b[0;0m\x1b[0;0m + b \x1b[94m'
|
|
- '\x1b[1mn_y\x1b[0;0m\x1b[0;0m + c\u22c5sin(\u03b1) \x1b[9'
|
|
- '4m\x1b[1mn_z\x1b[0;0m\x1b[0;0m')
|
|
+ if (pprint_use_unicode()):
|
|
+ expected = u(' 2\na \x1b[94m\x1b[1mn_x\x1b[0;0m\x1b[0;0m + b \x1b[94m'
|
|
+ '\x1b[1mn_y\x1b[0;0m\x1b[0;0m + c\u22c5sin(\u03b1) \x1b[9'
|
|
+ '4m\x1b[1mn_z\x1b[0;0m\x1b[0;0m')
|
|
+ else:
|
|
+ expected = u(' 2\na \x1b[94m\x1b[1mn_x\x1b[0;0m\x1b[0;0m + b \x1b[94m'
|
|
+ '\x1b[1mn_y\x1b[0;0m\x1b[0;0m + c*sin(alpha) \x1b[9'
|
|
+ '4m\x1b[1mn_z\x1b[0;0m\x1b[0;0m')
|
|
|
|
assert expected == pp.doprint(v)
|
|
assert expected == v._pretty().render()
|
|
|
|
- expected = u('\u03b1 \x1b[94m\x1b[1mn_x\x1b[0;0m\x1b[0;0m + sin(\u03c9'
|
|
- ') \x1b[94m\x1b[1mn_y\x1b[0;0m\x1b[0;0m + \u03b1\u22c5'
|
|
- '\u03b2 \x1b[94m\x1b[1mn_z\x1b[0;0m\x1b[0;0m')
|
|
+ if (pprint_use_unicode()):
|
|
+ expected = u('\u03b1 \x1b[94m\x1b[1mn_x\x1b[0;0m\x1b[0;0m + sin(\u03c9'
|
|
+ ') \x1b[94m\x1b[1mn_y\x1b[0;0m\x1b[0;0m + \u03b1\u22c5'
|
|
+ '\u03b2 \x1b[94m\x1b[1mn_z\x1b[0;0m\x1b[0;0m')
|
|
+ else:
|
|
+ expected = u('alpha \x1b[94m\x1b[1mn_x\x1b[0;0m\x1b[0;0m + sin(omega'
|
|
+ ') \x1b[94m\x1b[1mn_y\x1b[0;0m\x1b[0;0m + alpha*'
|
|
+ 'beta \x1b[94m\x1b[1mn_z\x1b[0;0m\x1b[0;0m')
|
|
|
|
assert expected == pp.doprint(w)
|
|
assert expected == w._pretty().render()
|
|
@@ -128,20 +138,34 @@ def test_vector_latex_with_functions():
|
|
|
|
def test_dyadic_pretty_print():
|
|
|
|
- expected = u(' 2\na \x1b[94m\x1b[1mn_x\x1b[0;0m\x1b[0;0m\u2297\x1b[94'
|
|
- 'm\x1b[1mn_y\x1b[0;0m\x1b[0;0m + b \x1b[94m\x1b[1mn_y\x1b'
|
|
- '[0;0m\x1b[0;0m\u2297\x1b[94m\x1b[1mn_y\x1b[0;0m\x1b[0;0m'
|
|
- ' + c\u22c5sin(\u03b1) \x1b[94m\x1b[1mn_z\x1b[0;0m\x1b[0;'
|
|
- '0m\u2297\x1b[94m\x1b[1mn_y\x1b[0;0m\x1b[0;0m')
|
|
+ if (pprint_use_unicode()):
|
|
+ expected = u(' 2\na \x1b[94m\x1b[1mn_x\x1b[0;0m\x1b[0;0m\u2297\x1b[94'
|
|
+ 'm\x1b[1mn_y\x1b[0;0m\x1b[0;0m + b \x1b[94m\x1b[1mn_y\x1b'
|
|
+ '[0;0m\x1b[0;0m\u2297\x1b[94m\x1b[1mn_y\x1b[0;0m\x1b[0;0m'
|
|
+ ' + c\u22c5sin(\u03b1) \x1b[94m\x1b[1mn_z\x1b[0;0m\x1b[0;'
|
|
+ '0m\u2297\x1b[94m\x1b[1mn_y\x1b[0;0m\x1b[0;0m')
|
|
+ else:
|
|
+ expected = u(' 2\na \x1b[94m\x1b[1mn_x\x1b[0;0m\x1b[0;0m\u2297\x1b[94'
|
|
+ 'm\x1b[1mn_y\x1b[0;0m\x1b[0;0m + b \x1b[94m\x1b[1mn_y\x1b'
|
|
+ '[0;0m\x1b[0;0m\u2297\x1b[94m\x1b[1mn_y\x1b[0;0m\x1b[0;0m'
|
|
+ ' + c*sin(alpha) \x1b[94m\x1b[1mn_z\x1b[0;0m\x1b[0;'
|
|
+ '0m\u2297\x1b[94m\x1b[1mn_y\x1b[0;0m\x1b[0;0m')
|
|
result = y._pretty().render()
|
|
|
|
assert expected == result
|
|
|
|
- expected = u('\u03b1 \x1b[94m\x1b[1mn_x\x1b[0;0m\x1b[0;0m\u2297\x1b[94'
|
|
- 'm\x1b[1mn_x\x1b[0;0m\x1b[0;0m + sin(\u03c9) \x1b[94m\x1b'
|
|
- '[1mn_y\x1b[0;0m\x1b[0;0m\u2297\x1b[94m\x1b[1mn_z\x1b[0;0'
|
|
- 'm\x1b[0;0m + \u03b1\u22c5\u03b2 \x1b[94m\x1b[1mn_z\x1b[0'
|
|
- ';0m\x1b[0;0m\u2297\x1b[94m\x1b[1mn_x\x1b[0;0m\x1b[0;0m')
|
|
+ if (pprint_use_unicode()):
|
|
+ expected = u('\u03b1 \x1b[94m\x1b[1mn_x\x1b[0;0m\x1b[0;0m\u2297\x1b[94'
|
|
+ 'm\x1b[1mn_x\x1b[0;0m\x1b[0;0m + sin(\u03c9) \x1b[94m\x1b'
|
|
+ '[1mn_y\x1b[0;0m\x1b[0;0m\u2297\x1b[94m\x1b[1mn_z\x1b[0;0'
|
|
+ 'm\x1b[0;0m + \u03b1\u22c5\u03b2 \x1b[94m\x1b[1mn_z\x1b[0'
|
|
+ ';0m\x1b[0;0m\u2297\x1b[94m\x1b[1mn_x\x1b[0;0m\x1b[0;0m')
|
|
+ else:
|
|
+ expected = u('alpha \x1b[94m\x1b[1mn_x\x1b[0;0m\x1b[0;0m\u2297\x1b[94'
|
|
+ 'm\x1b[1mn_x\x1b[0;0m\x1b[0;0m + sin(omega) \x1b[94m\x1b'
|
|
+ '[1mn_y\x1b[0;0m\x1b[0;0m\u2297\x1b[94m\x1b[1mn_z\x1b[0;0'
|
|
+ 'm\x1b[0;0m + alpha*beta \x1b[94m\x1b[1mn_z\x1b[0'
|
|
+ ';0m\x1b[0;0m\u2297\x1b[94m\x1b[1mn_x\x1b[0;0m\x1b[0;0m')
|
|
|
|
result = x._pretty().render()
|
|
|