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

Fix #2678. Don't emit multiple nested tags due to child element tail text.

Browse Source
This commit is contained in:
Marshall T. Vandegrift 2009-06-26 18:56:56 -04:00
parent ce300315d0
commit 1f18ef225f
1 changed files with 6 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/calibre/ebooks/mobi/mobiml.py
View File

@ -49,6 +49,7 @@ class BlockState(object):
class FormatState(object): class FormatState(object):
def __init__(self): def __init__(self):
self.rendered = False
self.left = 0. self.left = 0.
self.halign = 'auto' self.halign = 'auto'
self.indent = 0. self.indent = 0.
@ -159,13 +160,15 @@ class MobiMLizer(object):
indent = 0 indent = 0
elif indent != 0 and abs(indent) < self.profile.fbase: elif indent != 0 and abs(indent) < self.profile.fbase:
indent = (indent / abs(indent)) * self.profile.fbase indent = (indent / abs(indent)) * self.profile.fbase
if tag in NESTABLE_TAGS: if tag in NESTABLE_TAGS and not istate.rendered:
para = wrapper = etree.SubElement( para = wrapper = etree.SubElement(
parent, XHTML(tag), attrib=istate.attrib) parent, XHTML(tag), attrib=istate.attrib)
bstate.nested.append(para) bstate.nested.append(para)
if tag == 'li' and len(istates) > 1: if tag == 'li' and len(istates) > 1:
istates[-2].list_num += 1 istates[-2].list_num += 1
para.attrib['value'] = str(istates[-2].list_num) para.attrib['value'] = str(istates[-2].list_num)
elif tag in NESTABLE_TAGS and istate.rendered:
para = wrapper = bstate.nested[-1]
elif left > 0 and indent >= 0: elif left > 0 and indent >= 0:
para = wrapper = etree.SubElement(parent, XHTML('blockquote')) para = wrapper = etree.SubElement(parent, XHTML('blockquote'))
para = wrapper para = wrapper
@ -189,6 +192,7 @@ class MobiMLizer(object):
vspace -= 1 vspace -= 1
if istate.halign != 'auto' and isinstance(istate.halign, (str, unicode)): if istate.halign != 'auto' and isinstance(istate.halign, (str, unicode)):
para.attrib['align'] = istate.halign para.attrib['align'] = istate.halign
istate.rendered = True
pstate = bstate.istate pstate = bstate.istate
if tag in CONTENT_TAGS: if tag in CONTENT_TAGS:
bstate.inline = para bstate.inline = para
@ -253,6 +257,7 @@ class MobiMLizer(object):
return return
tag = barename(elem.tag) tag = barename(elem.tag)
istate = copy.copy(istates[-1]) istate = copy.copy(istates[-1])
istate.rendered = False
istate.list_num = 0 istate.list_num = 0
istates.append(istate) istates.append(istate)
left = 0 left = 0