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

FB2 Output: Use h1 tags to create section titles used for TOC.

Browse Source
This commit is contained in:
John Schember 2009-12-05 08:09:48 -05:00
parent b1aca05630
commit d03dc39fcb
1 changed files with 17 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
src/calibre/ebooks/fb2/fb2ml.py
View File

@ -46,6 +46,10 @@ TAG_LINKS = [
'a', 'a',
] ]
TAG_TITLE = [
'h1',
]
STYLES = [ STYLES = [
('font-weight', {'bold' : 'strong', 'bolder' : 'strong'}), ('font-weight', {'bold' : 'strong', 'bolder' : 'strong'}),
('font-style', {'italic' : 'emphasis'}), ('font-style', {'italic' : 'emphasis'}),
@ -196,7 +200,6 @@ class FB2MLizer(object):
return [u''] return [u'']
tag = barename(elem.tag) tag = barename(elem.tag)
tag_count = 0
if tag in TAG_IMAGES: if tag in TAG_IMAGES:
if elem.attrib.get('src', None): if elem.attrib.get('src', None):
@ -218,7 +221,6 @@ class FB2MLizer(object):
self.link_hrefs[href] = 'calibre_link-%s' % len(self.link_hrefs.keys()) self.link_hrefs[href] = 'calibre_link-%s' % len(self.link_hrefs.keys())
href = self.link_hrefs[href] href = self.link_hrefs[href]
fb2_text.append('<a xlink:href="#%s">' % href) fb2_text.append('<a xlink:href="#%s">' % href)
tag_count += 1
tag_stack.append('a') tag_stack.append('a')
# Anchor ids # Anchor ids
@ -226,11 +228,20 @@ class FB2MLizer(object):
if id_name: if id_name:
fb2_text.append(self.get_anchor(page, id_name)) fb2_text.append(self.get_anchor(page, id_name))
if tag in TAG_TITLE:
if 'p' in tag_stack:
ctag = []
ctag.append(tag_stack.pop())
while ctag[-1] != 'p':
ctag.append(tag_stack.pop())
fb2_text += self.close_tags(ctag)
fb2_text.append('</section><section><title><p>')
tag_stack.append('title')
tag_stack.append('p')
fb2_tag = TAG_MAP.get(tag, None) fb2_tag = TAG_MAP.get(tag, None)
if fb2_tag: if fb2_tag:
if fb2_tag not in tag_stack: if fb2_tag in tag_stack:
tag_count += 1
else:
tag_stack.reverse() tag_stack.reverse()
tag_stack.remove(fb2_tag) tag_stack.remove(fb2_tag)
tag_stack.reverse() tag_stack.reverse()
@ -242,7 +253,6 @@ class FB2MLizer(object):
for s in STYLES: for s in STYLES:
style_tag = s[1].get(style[s[0]], None) style_tag = s[1].get(style[s[0]], None)
if style_tag: if style_tag:
tag_count += 1
fb2_text.append('<%s>' % style_tag) fb2_text.append('<%s>' % style_tag)
tag_stack.append(style_tag) tag_stack.append(style_tag)
@ -260,7 +270,7 @@ class FB2MLizer(object):
fb2_text += self.dump_text(item, stylizer, page, tag_stack) fb2_text += self.dump_text(item, stylizer, page, tag_stack)
close_tag_list = [] close_tag_list = []
for i in range(0, tag_count): for i in range(0, len(tag_stack)):
close_tag_list.insert(0, tag_stack.pop()) close_tag_list.insert(0, tag_stack.pop())
fb2_text += self.close_tags(close_tag_list) fb2_text += self.close_tags(close_tag_list)