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

Fix calculation of textheight

Browse Source
This commit is contained in:
Kovid Goyal 2007-06-08 01:58:02 +00:00
parent 56d079512f
commit 5cf0a6befb
2 changed files with 10 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
src/libprs500/ebooks/lrf/__init__.py
View File

@ -29,8 +29,10 @@ __author__ = "Kovid Goyal <kovid@kovidgoyal.net>"
class PRS500_PROFILE(object): class PRS500_PROFILE(object):
screen_width = 600 screen_width = 600
screen_height = 775 screen_height = 765
dpi = 166 dpi = 166
# Number of pixels to subtract from screen_height when calculating height of text area
fudge = 18
def profile_from_string(option, opt_str, value, parser): def profile_from_string(option, opt_str, value, parser):
@ -77,7 +79,7 @@ def option_parser(usage):
help='''Right margin of page. Default is %default px.''') help='''Right margin of page. Default is %default px.''')
page.add_option('--top-margin', default=10, dest='top_margin', type='int', page.add_option('--top-margin', default=10, dest='top_margin', type='int',
help='''Top margin of page. Default is %default px.''') help='''Top margin of page. Default is %default px.''')
page.add_option('--bottom-margin', default=10, dest='bottom_margin', type='int', page.add_option('--bottom-margin', default=0, dest='bottom_margin', type='int',
help='''Bottom margin of page. Default is %default px.''') help='''Bottom margin of page. Default is %default px.''')
debug = parser.add_option_group('DEBUG OPTIONS') debug = parser.add_option_group('DEBUG OPTIONS')
@ -94,7 +96,7 @@ def Book(options, font_delta=0, header=None,
ps['evensidemargin'] = options.left_margin ps['evensidemargin'] = options.left_margin
ps['oddsidemargin'] = options.left_margin ps['oddsidemargin'] = options.left_margin
ps['textwidth'] = profile.screen_width - (options.left_margin + options.right_margin) ps['textwidth'] = profile.screen_width - (options.left_margin + options.right_margin)
ps['textheight'] = profile.screen_height - (options.top_margin + options.bottom_margin) ps['textheight'] = profile.screen_height - (options.top_margin + options.bottom_margin) - profile.fudge
if header: if header:
hdr = Header() hdr = Header()
hb = TextBlock(textStyle=TextStyle(align='foot', fontsize=60)) hb = TextBlock(textStyle=TextStyle(align='foot', fontsize=60))
@ -103,8 +105,7 @@ def Book(options, font_delta=0, header=None,
ps['headheight'] = 30 ps['headheight'] = 30
ps['header'] = hdr ps['header'] = hdr
ps['topmargin'] = 10 ps['topmargin'] = 10
if ps['textheight'] + ps['topmargin'] > profile.screen_height: ps['textheight'] = profile.screen_height - (options.bottom_margin + ps['topmargin']) - profile.fudge
ps['textheight'] = profile.screen_height - ps['topmargin']
baselineskip = (12 + 2*font_delta)*10 baselineskip = (12 + 2*font_delta)*10
return _Book(textstyledefault=dict(fontsize=100+font_delta*20, return _Book(textstyledefault=dict(fontsize=100+font_delta*20,
parindent=80, linespace=12, parindent=80, linespace=12,

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

@ -614,11 +614,13 @@ class HTMLConverter(object):
page = self.book.create_page(evensidemargin=0, oddsidemargin=0, page = self.book.create_page(evensidemargin=0, oddsidemargin=0,
topmargin=0, textwidth=self.profile.screen_width, topmargin=0, textwidth=self.profile.screen_width,
headheight=0, headsep=0, footspace=0, headheight=0, headsep=0, footspace=0,
footheight=0, footheight=0,
textheight=self.profile.screen_height) textheight=self.profile.screen_height)
if not self.images.has_key(path): if not self.images.has_key(path):
self.images[path] = ImageStream(path) self.images[path] = ImageStream(path)
ib = ImageBlock(self.images[path]) ib = ImageBlock(self.images[path], x1=self.profile.screen_width,
y1=self.profile.screen_height, blockwidth=self.profile.screen_width,
blockheight=self.profile.screen_height)
page.append(ib) page.append(ib)
self.book.append(page) self.book.append(page)