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

MOBI Out: Fix regression causing missing v-margins

Browse Source 
MOBI Output: Fix regression in 0.9.31 that caused vertical margins
specified on some block level elements to be ignored. Fixes #1186533 [Regression: some margins lost when converting to MOBI](https://bugs.launchpad.net/calibre/+bug/1186533)
This commit is contained in:
Kovid Goyal 2013-06-01 22:11:06 +05:30
parent b24493d7e8
commit 756fa6d32a
1 changed files with 4 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/calibre/ebooks/mobi/mobiml.py
View File

@ -20,7 +20,7 @@ def MBP(name):
return '{%s}%s' % (MBP_NS, name) return '{%s}%s' % (MBP_NS, name)
MOBI_NSMAP = {None: XHTML_NS, 'mbp': MBP_NS} MOBI_NSMAP = {None: XHTML_NS, 'mbp': MBP_NS}
INLINE_TAGS = {'span', 'a', 'code', 'u', 's', 'big', 'strike', 'tt', 'font', 'q', 'i', 'b', 'em', 'strong', 'sup', 'sub'}
HEADER_TAGS = set(['h1', 'h2', 'h3', 'h4', 'h5', 'h6']) HEADER_TAGS = set(['h1', 'h2', 'h3', 'h4', 'h5', 'h6'])
# GR: Added 'caption' to both sets # GR: Added 'caption' to both sets
NESTABLE_TAGS = set(['ol', 'ul', 'li', 'table', 'tr', 'td', 'th', 'caption']) NESTABLE_TAGS = set(['ol', 'ul', 'li', 'table', 'tr', 'td', 'th', 'caption'])
@ -489,6 +489,9 @@ class MobiMLizer(object):
if elem.text: if elem.text:
if istate.preserve: if istate.preserve:
text = elem.text text = elem.text
elif (len(elem) > 0 and isspace(elem.text) and elem[0].tag and
elem[0].tag.rpartition('}')[-1] not in INLINE_TAGS):
text = None
else: else:
text = COLLAPSE.sub(' ', elem.text) text = COLLAPSE.sub(' ', elem.text)
valign = style['vertical-align'] valign = style['vertical-align']