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 #608

Browse Source
This commit is contained in:
Kovid Goyal 2008-03-28 21:29:33 +00:00
parent 6e93542284
commit 7e1697e31a
1 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/libprs500/ebooks/lrf/html/convert_from.py
View File

@ -491,8 +491,9 @@ class HTMLConverter(object):
self.current_page = None self.current_page = None
if not top.has_text() and top.parent.contents.index(top) == len(top.parent.contents)-1: if not top.has_text() and top.parent.contents.index(top) == len(top.parent.contents)-1:
top.parent.contents.remove(top) # Empty block at the bottom of a page
opage = top.parent opage = top.parent
top.parent.contents.remove(top)
if self.book.last_page() is opage: if self.book.last_page() is opage:
if self.current_page and self.current_page.has_text(): if self.current_page and self.current_page.has_text():
for c in self.current_page.contents: for c in self.current_page.contents:
@ -599,7 +600,7 @@ class HTMLConverter(object):
while len(self.links) > 0: while len(self.links) > 0:
link = self.links.popleft() link = self.links.popleft()
para, text, path, fragment = link['para'], link['text'], link['path'], link['fragment'] para, text, path, fragment = link['para'], link['text'], link['path'], link['fragment']
ascii_text = text.encode('ascii', 'ignore') # Needed for TOC entries due to bug in SONY LRF renderer ascii_text = text.encode('ascii', 'replace') # Needed for TOC entries due to bug in SONY LRF renderer
if path in self.processed_files: if path in self.processed_files:
if path+fragment in self.targets.keys(): if path+fragment in self.targets.keys():
@ -625,7 +626,7 @@ class HTMLConverter(object):
def create_toc(self, toc): def create_toc(self, toc):
for item in toc.top_level_items(): for item in toc.top_level_items():
ascii_text = item.text.encode('ascii', 'ignore') # Bug in SONY LRF renderer ascii_text = item.text.encode('ascii', 'replace') # Bug in SONY LRF renderer
if not item.fragment and item.abspath in self.tops: if not item.fragment and item.abspath in self.tops:
self.book.addTocEntry(ascii_text, self.tops[item.abspath]) self.book.addTocEntry(ascii_text, self.tops[item.abspath])
else: else: