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

Fix #555

Browse Source
This commit is contained in:
Kovid Goyal 2008-03-06 21:30:45 +00:00
parent 9728f54d15
commit 70b2d0bec7
1 changed files with 8 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1018,16 +1018,15 @@ class HTMLConverter(object):
msrc = tag_css[what].split() msrc = tag_css[what].split()
for i in range(len(msrc)): for i in range(len(msrc)):
src[i] = msrc[i] src[i] = msrc[i]
i = 0 for i, c in enumerate(('-top', '-right', '-bottom', '-left')):
for c in ('-top', '-right', '-bottom', '-left'):
if tag_css.has_key(what+c): if tag_css.has_key(what+c):
src[i] = tag_css[what+c] src[i] = tag_css[what+c]
i += 1
return src return src
s1, s2 = get('margin'), get('padding') s1, s2 = get('margin'), get('padding')
bl = str(self.current_block.blockStyle.attrs['blockwidth'])+'px' bl = str(self.current_block.blockStyle.attrs['blockwidth'])+'px'
def set(default, one, two): def set(default, one, two):
fval = None fval = None
if one is not None: if one is not None:
@ -1047,13 +1046,17 @@ class HTMLConverter(object):
ans['footskip'] = set(self.book.defaultBlockStyle.attrs['footskip'], s1[2], s2[2]) ans['footskip'] = set(self.book.defaultBlockStyle.attrs['footskip'], s1[2], s2[2])
ans['sidemargin'] = set(self.book.defaultBlockStyle.attrs['sidemargin'], s1[3], s2[3]) ans['sidemargin'] = set(self.book.defaultBlockStyle.attrs['sidemargin'], s1[3], s2[3])
if 2*int(ans['sidemargin']) >= 0.8*int(self.current_block.blockStyle.attrs['blockwidth']): factor = 0.7
if 2*int(ans['sidemargin']) >= factor*int(self.current_block.blockStyle.attrs['blockwidth']):
# Try using (left + right)/2
val = int(ans['sidemargin']) val = int(ans['sidemargin'])
ans['sidemargin'] = set(self.book.defaultBlockStyle.attrs['sidemargin'], s1[1], s2[1]) ans['sidemargin'] = set(self.book.defaultBlockStyle.attrs['sidemargin'], s1[1], s2[1])
val += int(ans['sidemargin']) val += int(ans['sidemargin'])
val /= 2. val /= 2.
ans['sidemargin'] = int(val) ans['sidemargin'] = int(val)
if 2*int(ans['sidemargin']) >= factor*int(self.current_block.blockStyle.attrs['blockwidth']):
ans['sidemargin'] = int((factor*int(self.current_block.blockStyle.attrs['blockwidth']))/2.)
return ans return ans
def font_properties(self, css): def font_properties(self, css):