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

Workaround ADE bug in rendering of lists with a left margin set. Fixes #5415 (HTML to EPUB conversion breaks nested list display in ADE)

Browse Source
This commit is contained in:
Kovid Goyal 2010-04-30 08:53:32 -06:00
parent 78339374d8
commit 06d633b5d1
1 changed files with 17 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
src/calibre/ebooks/epub/output.py
View File

@ -364,6 +364,12 @@ class EPUBOutput(OutputFormatPlugin):
''' '''
from calibre.ebooks.oeb.base import XPath, XHTML, OEB_STYLES, barename, urlunquote from calibre.ebooks.oeb.base import XPath, XHTML, OEB_STYLES, barename, urlunquote
stylesheet = None
for item in self.oeb.manifest:
if item.media_type.lower() in OEB_STYLES:
stylesheet = item
break
# ADE cries big wet tears when it encounters an invalid fragment # ADE cries big wet tears when it encounters an invalid fragment
# identifier in the NCX toc. # identifier in the NCX toc.
frag_pat = re.compile(r'[-A-Za-z0-9_:.]+$') frag_pat = re.compile(r'[-A-Za-z0-9_:.]+$')
@ -460,11 +466,17 @@ class EPUBOutput(OutputFormatPlugin):
elem.tail = special_chars.sub('', elem.tail) elem.tail = special_chars.sub('', elem.tail)
elem.tail = elem.tail.replace(u'\u2011', '-') elem.tail = elem.tail.replace(u'\u2011', '-')
stylesheet = None if stylesheet is not None:
for item in self.oeb.manifest: # ADE doesn't render lists correctly if they have left margins
if item.media_type.lower() in OEB_STYLES: from cssutils.css import CSSRule
stylesheet = item for lb in XPath('//h:ul[@class]|//h:ol[@class]')(root):
break sel = '.'+lb.get('class')
for rule in stylesheet.data.cssRules.rulesOfType(CSSRule.STYLE_RULE):
if sel == rule.selectorList.selectorText:
val = rule.style.removeProperty('margin-left')
pval = rule.style.getProperty('padding-left')
if val and not pval:
rule.style.setProperty('padding-left', val)
if stylesheet is not None: if stylesheet is not None:
stylesheet.data.add('a { color: inherit; text-decoration: inherit; ' stylesheet.data.add('a { color: inherit; text-decoration: inherit; '