Backup_Repos/calibre
1
0
Fork 0
mirror of git://github.com/kovidgoyal/calibre.git synced 2026-05-04 23:23:38 +02:00
Code Issues Projects Releases Wiki Activity

[SNBOutput] Better handling of <li> tag.

Browse source
This commit is contained in:
Li Fanxi 2010-10-11 18:17:03 +08:00
parent 30e231c4a6
commit 8f3e1ca4d5
1 changed files with 13 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

20
src/calibre/ebooks/snb/snbml.py
View file

@ -92,7 +92,7 @@ def mlize(self):
etree.SubElement(snbcTree, "body")
trees[subitem] = snbcTree
output.append(u'%s%s\n\n' % (CALIBRE_SNB_BM_TAG, ""))
output += self.dump_text(self.subitems, etree.fromstring(content), stylizer)
output += self.dump_text(self.subitems, etree.fromstring(content), stylizer)[0]
output = self.cleanup_text(u''.join(output))
subitem = ''
@ -193,7 +193,7 @@ def cleanup_text(self, text):
return text
def dump_text(self, subitems, elem, stylizer, end='', pre=False):
def dump_text(self, subitems, elem, stylizer, end='', pre=False, li = ''):
if not isinstance(elem.tag, basestring) \
or namespace(elem.tag) != XHTML_NS:
@ -231,19 +231,24 @@ def dump_text(self, subitems, elem, stylizer, end='', pre=False):
if tag == 'br':
text.append(u'\n\n')
if tag == 'li':
li = '-- '
pre = (tag == 'pre' or pre)
# Process tags that contain text.
if hasattr(elem, 'text') and elem.text:
if pre:
text.append((u'\n\n%s' % CALIBRE_SNB_PRE_TAG ).join(elem.text.splitlines()))
text.append((u'\n\n%s' % CALIBRE_SNB_PRE_TAG ).join((li + elem.text).splitlines()))
else:
text.append(elem.text)
text.append(li + elem.text)
li = ''
for item in elem:
en = u''
if len(text) >= 2:
en = text[-1][-2:]
text += self.dump_text(subitems, item, stylizer, en, pre)
t, li = self.dump_text(subitems, item, stylizer, en, pre, li)
text += t
if in_block:
text.append(u'\n\n')
@ -252,6 +257,7 @@ def dump_text(self, subitems, elem, stylizer, end='', pre=False):
if pre:
text.append((u'\n\n%s' % CALIBRE_SNB_PRE_TAG ).join(elem.tail.splitlines()))
else:
text.append(elem.tail)
text.append(li + elem.tail)
li = ''
return text
return text, li