Show More
@@ -30,7 +30,6 b' try:' | |||
|
30 | 30 | except ImportError: |
|
31 | 31 | pass |
|
32 | 32 | |
|
33 | ||
|
34 | 33 | #----------------------------------------------------------------------------- |
|
35 | 34 | # Definitions of magic functions for use with IPython |
|
36 | 35 | #----------------------------------------------------------------------------- |
@@ -55,14 +54,32 b' def print_png(o):' | |||
|
55 | 54 | png = latex_to_png(s) |
|
56 | 55 | return png |
|
57 | 56 | |
|
57 | def can_print_latex(o): | |
|
58 | """ | |
|
59 | Return True if type o can be printed with LaTeX. | |
|
60 | ||
|
61 | If o is a container type, this is True if and only if every element of o | |
|
62 | can be printed with LaTeX. | |
|
63 | """ | |
|
64 | import sympy | |
|
65 | if isinstance(o, (list, tuple)): | |
|
66 | return all(can_print_latex(i) for i in o) | |
|
67 | elif isinstance(o, dict): | |
|
68 | return all((isinstance(i, basestring) or can_print_latex(i)) and can_print_latex(o[i]) for i in o) | |
|
69 | elif isinstance(o,(sympy.Basic, sympy.matrices.Matrix, int, long, float)): | |
|
70 | return True | |
|
71 | return False | |
|
58 | 72 | |
|
59 | 73 | def print_latex(o): |
|
60 |
"""A function to generate the latex representation of sympy |
|
|
74 | """A function to generate the latex representation of sympy | |
|
75 | expressions.""" | |
|
76 | if can_print_latex(o): | |
|
61 | 77 | s = latex(o, mode='plain') |
|
62 | 78 | s = s.replace('\\dag','\\dagger') |
|
63 | 79 | s = s.strip('$') |
|
64 | 80 | return '$$%s$$' % s |
|
65 | ||
|
81 | # Fallback to the string printer | |
|
82 | return None | |
|
66 | 83 | |
|
67 | 84 | _loaded = False |
|
68 | 85 | |
@@ -72,7 +89,9 b' def load_ipython_extension(ip):' | |||
|
72 | 89 | if not _loaded: |
|
73 | 90 | plaintext_formatter = ip.display_formatter.formatters['text/plain'] |
|
74 | 91 | |
|
75 |
for cls in (object, |
|
|
92 | for cls in (object, set, frozenset, str): | |
|
93 | # set and frozen set are currently broken with SymPy's latex() | |
|
94 | # function. See http://code.google.com/p/sympy/issues/detail?id=3062. | |
|
76 | 95 | plaintext_formatter.for_type(cls, print_basic_unicode) |
|
77 | 96 | |
|
78 | 97 | plaintext_formatter.for_type_by_name( |
@@ -87,6 +106,8 b' def load_ipython_extension(ip):' | |||
|
87 | 106 | png_formatter.for_type_by_name( |
|
88 | 107 | 'sympy.core.basic', 'Basic', print_png |
|
89 | 108 | ) |
|
109 | for cls in (list, tuple, dict, int, long, float): | |
|
110 | png_formatter.for_type(cls, print_png) | |
|
90 | 111 | |
|
91 | 112 | latex_formatter = ip.display_formatter.formatters['text/latex'] |
|
92 | 113 | latex_formatter.for_type_by_name( |
@@ -95,5 +116,9 b' def load_ipython_extension(ip):' | |||
|
95 | 116 | latex_formatter.for_type_by_name( |
|
96 | 117 | 'sympy.matrices.matrices', 'Matrix', print_latex |
|
97 | 118 | ) |
|
98 | _loaded = True | |
|
99 | 119 | |
|
120 | for cls in (list, tuple): | |
|
121 | # Use LaTeX only if every element is printable by latex | |
|
122 | latex_formatter.for_type(cls, print_latex) | |
|
123 | ||
|
124 | _loaded = True |
General Comments 0
You need to be logged in to leave comments.
Login now