' + self.processed_html.replace('\n\n', '
') + '' self.processed_html = self.processed_html.replace('\r\n', '\n') self.processed_html = self.processed_html.replace('> <', '>\n<') - self.processed_html = re.sub('\x14|\x15', '', self.processed_html) + self.processed_html = re.sub('\x14|\x15|\x1c|\x1d', '', self.processed_html) + + def ensure_unit(self, raw, unit='px'): + if re.search(r'\d+$', raw) is not None: + raw += unit + return raw def upshift_markup(self, root): self.log.debug('Converting style information to CSS...') @@ -469,13 +474,13 @@ class MobiReader(object): if attrib.has_key('height'): height = attrib.pop('height').strip() if height: - styles.append('margin-top: %s' % height) + styles.append('margin-top: %s' % self.ensure_unit(height)) if attrib.has_key('width'): width = attrib.pop('width').strip() if width: - styles.append('text-indent: %s' % width) + styles.append('text-indent: %s' % self.ensure_unit(width)) if width.startswith('-'): - styles.append('margin-left: %s' % (width[1:])) + styles.append('margin-left: %s' % self.ensure_unit(width[1:])) if attrib.has_key('align'): align = attrib.pop('align').strip() if align: diff --git a/src/calibre/ebooks/oeb/transforms/guide.py b/src/calibre/ebooks/oeb/transforms/guide.py index aaeba67d80..82bcaca72a 100644 --- a/src/calibre/ebooks/oeb/transforms/guide.py +++ b/src/calibre/ebooks/oeb/transforms/guide.py @@ -34,7 +34,7 @@ class Clean(object): for x in list(self.oeb.guide): href = urldefrag(self.oeb.guide[x].href)[0] - if x.lower() not in ('cover', 'titlepage'): + if x.lower() not in ('cover', 'titlepage', 'masthead'): self.oeb.guide.remove(x)