#5653: [with patch, needs rebase] display docstrings in the notebook using html
and jsMath
-------------------------+--------------------------------------------------
Reporter: jhpalmieri | Owner: jhpalmieri
Type: enhancement | Status: assigned
Priority: major | Milestone: sage-4.1.1
Component: notebook | Keywords:
Reviewer: | Author:
Merged: |
-------------------------+--------------------------------------------------
Comment(by jason):
I hate to say this, but I get conflicts on my 4.1 tree. I applied the
patches at #6307, then the patch here.
Can you rebase this?
{{{
applying docstring.6.patch
patching file sage/misc/sagedoc.py
Hunk #1 FAILED at 19
Hunk #2 FAILED at 111
Hunk #4 FAILED at 143
3 out of 6 hunks FAILED -- saving rejects to file sage/misc/sagedoc.py.rej
patch failed, unable to continue (try -v)
patch failed, rejects left in working dir
Errors during apply, please fix and refresh docstring.6.patch
}}}
It looks like this file was touched a lot in the last few weeks:
{{{
gr...@tiny:~/sage/devel/sage/sage/misc$ hg log -d -30 sagedoc.py
changeset: 12667:e40ab81e2c6d
tag: qtip
tag: docstring.6.patch
tag: tip
user: Mitesh Patel <[email protected]>
date: Sat Jun 20 09:07:16 2009 -0700
summary: #5653, pretty docstrings
changeset: 12653:3534c8c4de50
user: J. H. Palmieri <[email protected]>
date: Tue Jul 07 07:52:02 2009 -0700
summary: fix for ref manual
changeset: 12616:0df4e2e58e79
user: J. H. Palmieri <[email protected]>
date: Mon Jun 29 17:14:16 2009 -0700
summary: add 1 to line numbers
changeset: 12615:50be675c81f1
user: Dan Drake <[email protected]>
date: Sun Jun 28 22:17:17 2009 -0700
summary: [mq]: trac_6429_line_numbers.patch
changeset: 12614:6d776eac44c9
user: J. H. Palmieri <[email protected]>
date: Sun Jun 28 21:29:54 2009 -0700
summary: try to make search_src etc. less OS dependent
changeset: 12603:96d0f059d528
user: J. H. Palmieri <[email protected]>
date: Thu Jun 25 17:13:23 2009 -0700
summary: ref manual fixes
}}}
--
Ticket URL: <http://trac.sagemath.org/sage_trac/ticket/5653#comment:40>
Sage <http://sagemath.org/>
Sage: Creating a Viable Open Source Alternative to Magma, Maple, Mathematica,
and MATLAB
--~--~---------~--~----~------------~-------~--~----~
You received this message because you are subscribed to the Google Groups
"sage-trac" group.
To post to this group, send email to [email protected]
To unsubscribe from this group, send email to
[email protected]
For more options, visit this group at
http://groups.google.com/group/sage-trac?hl=en
-~----------~----~----~----~------~----~------~--~---
