Cutlery/calibre
1
0
Fork 0
mirror of https://github.com/kovidgoyal/calibre.git synced 2025-07-09 03:04:10 -04:00
Code Issues Packages Projects Releases Wiki Activity

TXT/RTF Output: Handle XML processing instructions embedded in content correctly. Fixes #7644 (Convert epub to rtf or txt - text sections get lost)

Browse Source
This commit is contained in:
Kovid Goyal 2010-11-25 09:48:14 -07:00
parent 5825d31ed8
commit 3096514c42
2 changed files with 8 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/calibre/ebooks/rtf/rtfml.py
View File

@ -191,6 +191,10 @@ class RTFMLizer(object):
def dump_text(self, elem, stylizer, tag_stack=[]):
if not isinstance(elem.tag, basestring) \
or namespace(elem.tag) != XHTML_NS:
p = elem.getparent()
if isinstance(p.tag, basestring) and namespace(p.tag) == XHTML_NS \
and elem.tail:
return elem.tail
return u''
text = u''

4
src/calibre/ebooks/txt/txtml.py
View File

@ -155,6 +155,10 @@ class TXTMLizer(object):
if not isinstance(elem.tag, basestring) \
or namespace(elem.tag) != XHTML_NS:
p = elem.getparent()
if isinstance(p.tag, basestring) and namespace(p.tag) == XHTML_NS \
and elem.tail:
return [elem.tail]
return ['']
text = ['']