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 #4707 (Unable to mount ext3 partition of device)

Browse Source
This commit is contained in:
Kovid Goyal 2010-01-27 17:38:04 -07:00
parent b1b291007c
commit 299e176264
2 changed files with 33 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/calibre/devices/linux_mount_helper.c
View File

@ -71,7 +71,7 @@ int do_mount(const char *dev, const char *mp) {
#ifdef __NetBSD__ #ifdef __NetBSD__
execlp("mount_msdos", "mount_msdos", "-u", uids, "-g", gids, "-o", options, dev, mp, NULL); execlp("mount_msdos", "mount_msdos", "-u", uids, "-g", gids, "-o", options, dev, mp, NULL);
#else #else
execlp("mount", "mount", "-t", "vfat", "-o", options, dev, mp, NULL); execlp("mount", "mount", "-t", "auto", "-o", options, dev, mp, NULL);
#endif #endif
errsv = errno; errsv = errno;
fprintf(stderr, "Failed to mount with error: %s\n", strerror(errsv)); fprintf(stderr, "Failed to mount with error: %s\n", strerror(errsv));

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

@ -160,9 +160,10 @@ class Column(object):
elem.indent_fraction = left_margin/self.width elem.indent_fraction = left_margin/self.width
elem.width_fraction = elem.width/self.width elem.width_fraction = elem.width/self.width
if i == 0: if i == 0:
elem.top_gap = None elem.top_gap_ratio = None
else: else:
elem.top_gap = self.elements[i-1].bottom - elem.top elem.top_gap_ratio = (self.elements[i-1].bottom -
elem.top)/self.average_line_separation
def previous_element(self, idx): def previous_element(self, idx):
if idx == 0: if idx == 0:
@ -175,6 +176,11 @@ class Box(list):
def __init__(self, type='p'): def __init__(self, type='p'):
self.type = type self.type = type
class ImageBox(Box):
def __init__(self, img):
Box.__init__(self, type='img')
self.img = img
class Region(object): class Region(object):
@ -226,8 +232,30 @@ class Region(object):
for x in self.columns: for x in self.columns:
self.elements.extend(x) self.elements.extend(x)
# Find block quotes self.boxes = [Box()]
indented = [i for (i, x) in enumerate(self.elements) if x.indent_fraction >= 0.2] for i, elem in enumerate(self.elements):
if isinstance(elem, Image):
self.boxes.append(ImageBox(elem))
img = Interval(elem.left, elem.right)
for j in range(i+1, len(self.elements)):
t = self.elements[j]
if not isinstance(t, Text):
break
ti = Interval(t.left, t.right)
if not ti.centered_in(img):
break
self.boxes[-1].append(t)
self.boxes.append(Box())
else:
is_indented = False
if i+1 < len(self.elements):
indent_diff = elem.indent_fraction - \
self.elements[i+1].indent_fraction
if indent_diff > 0.05:
is_indented = True
if elem.top_gap_ratio > 1.2 or is_indented:
self.boxes.append(Box())
self.boxes[-1].append(elem)