Opened 11 years ago
Last modified 10 years ago
#11775 closed enhancement
Make pretty_print take multiple arguments — at Version 36
Reported by: | ppurka | Owned by: | jason |
---|---|---|---|
Priority: | major | Milestone: | sage-5.1 |
Component: | misc | Keywords: | pretty print sd40.5 |
Cc: | Merged in: | ||
Authors: | Punarbasu Purkayastha | Reviewers: | Keshav Kini |
Report Upstream: | N/A | Work issues: | |
Branch: | Commit: | ||
Dependencies: | Stopgaps: |
Description (last modified by )
The pretty_print function currently takes only one argument. This somehow makes it difficult to print multiple things in one line, for instance the following is currently not possible:
A = identity_matrix(2); pretty_print("A = ", A)
with the output being "A = <the matrix A on the same line>"
I am attaching a patch which allows pretty_print to take in multiple arguments. It is based on some code by _leif @ #sagemath (See http://sagenb.org/home/pub/3111/ ). Also kini @ #sagemath helped in passing the doctests.
The modifications are to 1) the function pretty_print 2) the doctests in pretty_print 3) the doctest in pretty_print_default (whitespace issues)
Either
Apply only trac_11775-pretty_print_multiple_args.4.patch to SAGE_ROOT/devel/sage
for jsmath
-based sage{nb}.
Change History (44)
Changed 11 years ago by
comment:1 Changed 11 years ago by
I was told to mention the ticket number in my patch. Please consider the patch "trac_11775_pretty_print_multiple_args.diff" instead of the originally uploaded one.
comment:2 Changed 11 years ago by
- Description modified (diff)
In particular you need to mention the ticket number in your commit message. I fixed your patch. Doctesting on sage.math now.
comment:3 Changed 11 years ago by
- Status changed from new to needs_review
comment:4 Changed 11 years ago by
- Reviewers set to Keshav Kini
- Summary changed from [with patch] Make pretty_print take multiple arguments to Make pretty_print take multiple arguments
I rebased the patch on 4.7.2.alpha3 (because of #11498 mainly). I got rid of the last chunk since I'm not sure that it's still relevant. Please sanity check! Here's the patch diff:
-
11775-pretty_print_multiple_args.patch
diff --git a/11775-pretty_print_multiple_args.patch b/.hg/patches/11775-pretty_print_multiple_args.patch index 8d4bdbf..0a9516d 100644
old new 1 1 # HG changeset patch 2 2 # User P Purkayastha <ppurka@gmail.com> 3 # Date 131 5137052 -288003 # Date 1317393015 25200 4 4 # Node ID a5526ce127658e2865704fd6c30f8cde603c0a45 5 # Parent 2a2abbcad325ccca9399981ceddf5897eb467e645 # Parent 8a0b4f90f1ca76dbdba159897c39209c5da85442 6 6 trac #11775: make pretty_print accept multiple arguments 7 7 8 8 diff --git a/sage/misc/latex.py b/sage/misc/latex.py 9 9 --- a/sage/misc/latex.py 10 10 +++ b/sage/misc/latex.py 11 @@ -2 077,7 +2077,7 @@11 @@ -2120,7 +2120,7 @@ 12 12 else: 13 13 print(object) 14 14 … … diff --git a/sage/misc/latex.py b/sage/misc/latex.py 17 17 r""" 18 18 Try to pretty print an object in an intelligent way. For graphics 19 19 objects, this returns their default representation. For other 20 @@ -2 096,24 +2096,39 @@20 @@ -2139,24 +2139,39 @@ 21 21 22 22 sage: from sage.misc.latex import pretty_print 23 23 sage: pretty_print(ZZ) # indirect doctest 24 24 - <html><span class="math">\newcommand{\Bold}[1]{\mathbf{#1}}\Bold{Z}</span></html> 25 + <html><span class="math">\newcommand{\Bold}[1]{\mathbf{#1}}\ hbox{$\Bold{Z}$}</span></html>25 + <html><span class="math">\newcommand{\Bold}[1]{\mathbf{#1}}\verb|$\Bold{Z}$|</span></html> 26 26 + sage: pretty_print("Integers = ", ZZ, ", $\\frac{d(x^3)}{dx} =$ ", derivative(x^3, x)) # test m 27 + <html><span class="math">\newcommand{\Bold}[1]{\mathbf{#1}}\ hbox{Integers = $\Bold{Z}$, $\frac{27 + <html><span class="math">\newcommand{\Bold}[1]{\mathbf{#1}}\verb|Integers|\phantom{x}\verb|=|\p 28 28 """ 29 29 - if object is None: 30 30 - return … … diff --git a/sage/misc/latex.py b/sage/misc/latex.py 73 73 74 74 def pretty_print_default(enable=True): 75 75 r""" 76 @@ -2130,7 +2145,7 @@77 78 sage: pretty_print_default(True)79 sage: sys.displayhook80 - <html><span class="math">...\hbox{ < function pretty_print at ... > }</span></html>81 + <html><span class="math">...\hbox{<function pretty_print at ...>}</span></html>82 sage: pretty_print_default(False)83 sage: sys.displayhook == sys.__displayhook__84 True
Doctesting again now.
comment:5 Changed 11 years ago by
- Description modified (diff)
comment:6 follow-up: ↓ 14 Changed 11 years ago by
Breaks a couple doctested examples in the documentation (tutorial). Testing new patch...
comment:7 Changed 11 years ago by
- Description modified (diff)
comment:8 Changed 11 years ago by
- Status changed from needs_review to positive_review
All tests pass! Positive review from me.
comment:9 Changed 11 years ago by
- Description modified (diff)
- Keywords pretty print added; pretty_print removed
comment:10 Changed 11 years ago by
- Merged in set to sage-4.7.2.alpha4
- Resolution set to fixed
- Status changed from positive_review to closed
comment:11 Changed 11 years ago by
- Merged in sage-4.7.2.alpha4 deleted
- Milestone changed from sage-4.7.2 to sage-4.7.3
- Resolution fixed deleted
- Status changed from closed to new
As clearly evidenced in the changed doctests, this breaks the notebook "typeset" option.
comment:12 Changed 11 years ago by
- Status changed from new to needs_review
comment:13 Changed 11 years ago by
- Status changed from needs_review to needs_work
- Work issues set to Fix notebook "typeset"
comment:14 in reply to: ↑ 6 ; follow-up: ↓ 18 Changed 11 years ago by
Replying to kini:
Breaks a couple doctested examples in the documentation (tutorial).
For good reason! These doctest failures indicate problems with the patch, not with the doctest so they should not be broken.
comment:15 Changed 11 years ago by
Investigating...
This \verb|
thing in the output seems new to me and it seems it's something I overlooked in the later patches. In the original patch, the output didn't contain \verb|
. Maybe this is why the pretty_print is breaking this stuff.
comment:16 Changed 11 years ago by
I would also suggest that if the function is going to accept more than one argument, then the documentation shouldn't say
Try to pretty print an object in an intelligent way.
but rather something like
Try to pretty print the arguments in an intelligent way.
The INPUT
block should be changed, also.
comment:17 follow-up: ↓ 19 Changed 11 years ago by
Actually, #11498 fixed a *lot* of latex related output but with it something like the following no longer works: view('$f(x) = x^2$')
.
It seems to me that the fix for this, if any, will be a lot more invasive and won't be confined to the pretty_print
function any more.
comment:18 in reply to: ↑ 14 ; follow-up: ↓ 20 Changed 11 years ago by
Are you suggesting to reopen #11498?
comment:19 in reply to: ↑ 17 Changed 11 years ago by
Replying to ppurka:
Actually, #11498 fixed a *lot* of latex related output but with it something like the following no longer works:
view('$f(x) = x^2$')
.
No, I think technically it does work now, and it didn't work before #11498: running view
on a string should just render it verbatim. Of course, the broken behavior was actually pretty nice. I think it would be nice to be able to LaTeX a string easily, but not just using the view
function. There might even be a ticket somewhere for this, but I couldn't find it with a quick search.
comment:20 in reply to: ↑ 18 ; follow-up: ↓ 21 Changed 11 years ago by
Replying to kini:
Are you suggesting to reopen #11498?
No. Please don't reopen #11498. It is a massive cleanup of the code.
@jhpalmieri there is a way. You can simply do html('$f(x) = x^2$')
. But it doesn't retain the blue color and it won't work with the viewer=pdf
setting. So, modifying view()
and thereabouts (maybe list_function
or tuple_function
too) is probably the only way to implement it now, while still retaining these earlier functionality.
comment:21 in reply to: ↑ 20 Changed 11 years ago by
Replying to ppurka:
@jhpalmieri there is a way. You can simply do
html('$f(x) = x^2$')
.
You can also put it in an %html
block or in a %latex
block. These solutions only work in the notebook, though. Anyway, it shouldn't be too hard to write a function which takes a string, passes it through jsMath
or LaTeX
depending on the context and on other arguments (like viewer=pdf
), and produces nice looking output, both from the command-line and the notebook. I think that this should be done by a function other than view
, though: view should render a string verbatim, so it can handle names of Python classes, for example. Maybe the right approach is to create such a function and to rewrite view
: the new function would render a string in LaTeX
, and view
would call the new function after preparing the string appropriately.
comment:23 Changed 10 years ago by
- Description modified (diff)
- Milestone set to sage-4.8
- Status changed from needs_work to needs_review
- Work issues Fix notebook "typeset" deleted
Updated patch to make it work with Typeset on or off, and also take in multiple arguments. Passes doctests: ../../sage -t -long ./sage/misc
.
The view()
, tuple_function()
, latex()
and JSMath()
in devel/sage/sage/misc/latex.py
have been updated to take in an extra argument combine_all
. The way it works is:
- if
combine_all
isTrue
then the string returned bytuple_function
does not return a tuple and it instead combines all the elements it receives. It does not collapse a tuple inside a tuple.
- if
combine_all
isFalse
(the default) then everything behaves as earlier.
combine_all
is passed asTrue
frompretty_print
whenever it calls theview()
function.
comment:24 follow-up: ↓ 25 Changed 10 years ago by
You haven't done anything with my suggestions above.
comment:25 in reply to: ↑ 24 Changed 10 years ago by
Replying to jhpalmieri:
You haven't done anything with my suggestions above.
Sorry! I must have overlooked this post and the documentation of pretty_print
itself. I have fixed it and also fixed the call to JSMath from inside pretty_print
.
comment:26 Changed 10 years ago by
I am wondering. Is there anywhere where sage.misc.latex.png()
function is used? In all my testing of the notebook I believe it never enters or calls the png()
function.
If there are some use cases where the png()
function is important, then I believe I should also patch that. Currently, I believe the usage of png() function will still go through and return a tuple, just like we get a tuple back when typeset is on in the notebook and we give multiple commands on the same line like: identity_matrix(2), identity_matrix(2)
comment:27 Changed 10 years ago by
Proof of concept of typesetting function (to typeset a string using LaTeX):
# something like this could be in latex.py... def typeset(s, debug=False, viewer=None, **kwds): r"""nodetex Typeset a string using LaTeX. """ if EMBEDDED_MODE and viewer is None: Latex(density=130, debug=debug, **kwds).eval(s, globals=globals()) return png_file = tmp_filename() Latex().eval(s, globals=globals(), filename=png_file, debug=debug, **kwds) import sage.misc.viewer viewer = sage.misc.viewer.png_viewer() if viewer.startswith('sage-native-execute '): viewer = viewer.split()[1] if debug: print 'viewer: "{0}"'.format(viewer) subprocess.call(['sage-native-execute', viewer, png_file+'.png'], stdout=subprocess.PIPE, stderr=subprocess.PIPE) return
comment:28 Changed 10 years ago by
- Status changed from needs_review to needs_work
- Work issues set to Fix typeset of latex strings
comment:29 Changed 10 years ago by
See also #12156.
comment:30 Changed 10 years ago by
I think we should defer the typesetting of latex strings to #12156. So perhaps this can be set to "needs review" again?
comment:31 Changed 10 years ago by
- Description modified (diff)
- Status changed from needs_work to needs_review
- Work issues Fix typeset of latex strings deleted
comment:32 Changed 10 years ago by
- Description modified (diff)
comment:33 Changed 10 years ago by
Updated both patches to include space between tuple elements. This addresses the same issue that cropped up in #12156.
comment:34 Changed 10 years ago by
- Description modified (diff)
Updated documentation to be more consistent with the existing format.
comment:35 Changed 10 years ago by
- Description modified (diff)
Updated patch to mathjax based sagenb. Apply new patch only after applying patches from #9774.
Otherwise the old patch should apply just fine.
It passes doctests in sage/misc
except for the two (unrelated) failures stemming from the mathjax patch in #9774 and also these (unrelated) ones:
sage -t "devel/sage-main-backup/sage/misc/latex_macros.py" ********************************************************************** File "/home/punarbasu/Installations/sage-5.0.beta2/devel/sage-main-backup/sage/misc/latex_macros.py", line 121: sage: convert_latex_macro_to_mathjax('\\newcommand{\\ZZ}{\\Bold{Z}}') Expected: 'ZZ: "\\Bold{Z}"' Got: 'ZZ: "\\\\Bold{Z}"' ********************************************************************** File "/home/punarbasu/Installations/sage-5.0.beta2/devel/sage-main-backup/sage/misc/latex_macros.py", line 123: sage: convert_latex_macro_to_mathjax('\\newcommand{\\GF}[1]{\\Bold{F}_{#1}}') Expected: 'GF: ["\\Bold{F}_{#1}",1]' Got: 'GF: ["\\\\Bold{F}_{#1}",1]' ********************************************************************** 1 items had failures: 2 of 6 in __main__.example_2 ***Test Failed*** 2 failures. For whitespace errors, see the file /home/punarbasu/.sage//tmp/latex_macros_8554.py sage -t "devel/sage-main-backup/sage/misc/hg.py" changeset: 16520:7c0237f6509d tag: qtip tag: tip tag: trac_11775-pretty_print_multiple_args_mathjax.patch user: Punarbasu Purkayastha <ppurka@gmail.com> date: Sun Feb 26 00:58:06 2012 +0800 summary: make pretty_print accept multiple arguments trac_11078.patch trac-11503-jmol-commandline.patch trac-12229-sagenb-developer-doc.2.patch trac-12229-manifest.patch trac-11080-notebook-docs.patch trac_9774-mathjax-try4.patch trac_11775-pretty_print_multiple_args_mathjax.patch trac_11078.patch trac-11503-jmol-commandline.patch trac-12229-sagenb-developer-doc.2.patch trac-12229-manifest.patch trac-11080-notebook-docs.patch trac_9774-mathjax-try4.patch trac_11775-pretty_print_multiple_args_mathjax.patch ********************************************************************** File "/home/punarbasu/Installations/sage-5.0.beta2/devel/sage-main-backup/sage/misc/hg.py", line 262: sage: 'main' in hg_sage.list_branches(print_flag=False) Expected: True Got: False ********************************************************************** 1 items had failures: 1 of 5 in __main__.example_8 ***Test Failed*** 1 failures. For whitespace errors, see the file /home/punarbasu/.sage//tmp/hg_9014.py [3.5 s]
comment:36 Changed 10 years ago by
- Description modified (diff)
- Keywords sd40.5 added
Updated to sage-5.1beta0. For sd40.5 :)
The patch to pretty_print and pretty_print_default