Cutlery/calibre
1
0
Fork 0
mirror of https://github.com/kovidgoyal/calibre.git synced 2025-07-07 10:14:46 -04:00
Code Issues Packages Projects Releases Wiki Activity

...

Browse Source
This commit is contained in:
Kovid Goyal 2010-02-13 18:10:19 -07:00
parent 8692cb1059
commit a2229b6e51
2 changed files with 27 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/calibre/devices/android/driver.py
View File

@ -20,7 +20,7 @@ class ANDROID(USBMS):
VENDOR_ID = { VENDOR_ID = {
0x0bb4 : { 0x0c02 : [0x100], 0x0c01 : [0x100]}, 0x0bb4 : { 0x0c02 : [0x100], 0x0c01 : [0x100]},
0x22b8 : { 0x41d9 : [0x216]}, 0x22b8 : { 0x41d9 : [0x216]},
0x18d1 : { 0x4e11 : [0x0100]}, 0x18d1 : { 0x4e11 : [0x0100], 0x4e12: [0x0100]},
} }
EBOOK_DIR_MAIN = ['wordplayer/calibretransfer', 'eBooks/import', 'Books'] EBOOK_DIR_MAIN = ['wordplayer/calibretransfer', 'eBooks/import', 'Books']
EXTRA_CUSTOMIZATION_MESSAGE = _('Comma separated list of directories to ' EXTRA_CUSTOMIZATION_MESSAGE = _('Comma separated list of directories to '

30
src/calibre/ebooks/pdf/reflow.py
View File

@ -282,7 +282,6 @@ class Region(object):
mc = self.columns[0] mc = self.columns[0]
return mc return mc
print
for c in singleton.columns: for c in singleton.columns:
for elem in c: for elem in c:
col = most_suitable_column(elem) col = most_suitable_column(elem)
@ -309,15 +308,38 @@ class Region(object):
def absorb_region(self, region, at): def absorb_region(self, region, at):
src_iter = lambda x:x if at == 'bottom' else reversed src_iter = lambda x:x if at == 'bottom' else reversed
if len(region.columns) == len(self.columns): if len(region.columns) <= len(self.columns):
for src, dest in zip(region.columns, self.columns): for i in range(len(region.columns)):
src, dest = region.columns[i], self.columns[i]
for elem in src_iter(src): for elem in src_iter(src):
if at == 'bottom': if at == 'bottom':
dest.append(elem) dest.append(elem)
else: else:
dest.insert(0, elem) dest.insert(0, elem)
else: else:
pass col_map = {}
for i, col in enumerate(region.columns):
max_overlap, max_overlap_index = 0, 0
for j, dcol in enumerate(self.columns):
sint = Interval(col.left, col.right)
dint = Interval(dcol.left, dcol.right)
width = sint.intersection(dint).width
if width > max_overlap:
max_overlap = width
max_overlap_index = j
col_map[i] = max_overlap_index
lines = max(map(len, region.columns))
for i in range(src_iter(lines)):
for j, src in enumerate(region.columns):
dest = self.columns[col_map[j]]
if i < len(src):
if at == 'bottom':
dest.append(src[i])
else:
dest.insert(0, src[i])
def linearize(self): def linearize(self):
self.elements = [] self.elements = []