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

Make width % on table cells purely advisory

Browse Source
This commit is contained in:
Kovid Goyal 2007-10-26 16:53:54 +00:00
parent 4b3c2b6e80
commit 4016318029
1 changed files with 5 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
src/libprs500/ebooks/lrf/html/table.py
View File

@ -327,28 +327,22 @@ class Table(object):
except IndexError: except IndexError:
continue continue
widths[c] = max(cellwidths) widths[c] = max(cellwidths)
adjustable_columns, psum = [], 0.
min_widths = [self.minimum_width(i)+10 for i in xrange(cols)] min_widths = [self.minimum_width(i)+10 for i in xrange(cols)]
for i in xrange(len(widths)): for i in xrange(len(widths)):
wp = self.width_percent(i) wp = self.width_percent(i)
if wp >= 0.: if wp >= 0.:
psum += wp widths[i] = max(min_widths[i], ceil((wp/100.) * (maxwidth - (cols-1)*self.colpad)))
if psum > 100:
adjustable_columns.append(i)
else:
widths[i] = ceil((wp/100.) * (maxwidth - (cols-1)*self.colpad))
if widths[i] < min_widths[i]:
widths[i] = min_widths[i]
else:
adjustable_columns.append(i)
itercount = 0 itercount = 0
while sum(widths) > maxwidth-((len(widths)-1)*self.colpad) and itercount < 100: while sum(widths) > maxwidth-((len(widths)-1)*self.colpad) and itercount < 100:
for i in adjustable_columns: for i in range(cols):
widths[i] = ceil((95./100.)*widths[i]) if \ widths[i] = ceil((95./100.)*widths[i]) if \
ceil((95./100.)*widths[i]) >= min_widths[i] else widths[i] ceil((95./100.)*widths[i]) >= min_widths[i] else widths[i]
itercount += 1 itercount += 1
return [i+self.colpad for i in widths] return [i+self.colpad for i in widths]
def blocks(self, maxwidth, maxheight): def blocks(self, maxwidth, maxheight):