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

Minor tweaks to renderer profiles and CSS fixing.

Browse Source
This commit is contained in:
Marshall T. Vandegrift 2009-01-16 20:02:05 -05:00
parent e8f7219108
commit 5225b1f0b0
2 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/calibre/ebooks/oeb/profile.py
View File

@ -47,15 +47,15 @@ PROFILES = {
# No clue on usable screen size; DPI should be good # No clue on usable screen size; DPI should be good
'HanlinV3': 'HanlinV3':
Profile(width=584, height=754, dpi=168.451, fbase=16, Profile(width=584, height=754, dpi=168.451, fbase=16,
fsizes=[12, 12, 14, 16, 18, 21, 24, 28]), fsizes=[12, 12, 14, 16, 18, 20, 22, 24]),
'CybookG3': 'CybookG3':
Profile(width=600, height=800, dpi=168.451, fbase=16, Profile(width=600, height=800, dpi=168.451, fbase=16,
fsizes=[12, 12, 14, 16, 18, 21, 24, 28]), fsizes=[12, 12, 14, 16, 18, 20, 22, 24]),
'Kindle': 'Kindle':
Profile(width=525, height=640, dpi=168.451, fbase=16, Profile(width=525, height=640, dpi=168.451, fbase=16,
fsizes=[12, 12, 14, 16, 18, 21, 24, 28]), fsizes=[12, 12, 14, 16, 18, 20, 22, 24]),
'Browser': 'Browser':
Profile(width=800, height=600, dpi=100.0, fbase=12, Profile(width=800, height=600, dpi=100.0, fbase=12,

2
src/calibre/ebooks/oeb/transforms/flatcss.py
View File

@ -185,6 +185,8 @@ class CSSFlattener(object):
percent = (margin - style['text-indent']) / style['width'] percent = (margin - style['text-indent']) / style['width']
cssdict['margin-left'] = "%d%%" % (percent * 100) cssdict['margin-left'] = "%d%%" % (percent * 100)
left -= style['text-indent'] left -= style['text-indent']
if 'display' in cssdict and cssdict['display'] == 'in-line':
cssdict['display'] = 'inline'
if self.unfloat and 'float' in cssdict \ if self.unfloat and 'float' in cssdict \
and cssdict.get('display', 'none') != 'none': and cssdict.get('display', 'none') != 'none':
del cssdict['display'] del cssdict['display']