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 LIT strange pagination bug.

Browse Source
This commit is contained in:
Marshall T. Vandegrift 2009-02-03 12:43:36 -05:00
parent beb45413fe
commit 8367902cb1
1 changed files with 12 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
src/calibre/ebooks/lit/writer.py
View File

@ -23,7 +23,7 @@ from urllib import unquote as urlunquote
from lxml import etree from lxml import etree
from calibre.ebooks.lit.reader import DirectoryEntry from calibre.ebooks.lit.reader import DirectoryEntry
import calibre.ebooks.lit.maps as maps import calibre.ebooks.lit.maps as maps
from calibre.ebooks.oeb.base import OEB_DOCS, OEB_STYLES, OEB_CSS_MIME, \ from calibre.ebooks.oeb.base import OEB_DOCS, XHTML_MIME, OEB_STYLES, \
CSS_MIME, OPF_MIME, XML_NS, XML CSS_MIME, OPF_MIME, XML_NS, XML
from calibre.ebooks.oeb.base import namespace, barename, prefixname, \ from calibre.ebooks.oeb.base import namespace, barename, prefixname, \
urlnormalize, xpath urlnormalize, xpath
@ -495,7 +495,7 @@ class LitWriter(object):
if item.spine_position is not None: if item.spine_position is not None:
key = 'linear' if item.linear else 'nonlinear' key = 'linear' if item.linear else 'nonlinear'
manifest[key].append(item) manifest[key].append(item)
elif item.media_type == CSS_MIME: elif item.media_type in OEB_STYLES:
manifest['css'].append(item) manifest['css'].append(item)
elif item.media_type in LIT_IMAGES: elif item.media_type in LIT_IMAGES:
manifest['images'].append(item) manifest['images'].append(item)
@ -508,6 +508,11 @@ class LitWriter(object):
data.write(pack('<I', len(items))) data.write(pack('<I', len(items)))
for item in items: for item in items:
id, media_type = item.id, item.media_type id, media_type = item.id, item.media_type
if media_type in OEB_DOCS:
# Needs to have 'html' in media-type
media_type = XHTML_MIME
elif media_type in OEB_STYLES:
media_type = CSS_MIME
href = urlunquote(item.href) href = urlunquote(item.href)
item.offset = offset \ item.offset = offset \
if state in ('linear', 'nonlinear') else 0 if state in ('linear', 'nonlinear') else 0
@ -527,7 +532,12 @@ class LitWriter(object):
pb3 = StringIO() pb3 = StringIO()
pb3cur = 0 pb3cur = 0
bits = 0 bits = 0
linear = []
nonlinear = []
for item in self._oeb.spine: for item in self._oeb.spine:
dest = linear if item.linear else nonlinear
dest.append(item)
for item in chain(linear, nonlinear):
page_breaks = copy.copy(item.page_breaks) page_breaks = copy.copy(item.page_breaks)
if not item.linear: if not item.linear:
page_breaks.insert(0, (0, [])) page_breaks.insert(0, (0, []))