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 incorrect detection of border ToC nodes in different files

Browse Source
This commit is contained in:
Kovid Goyal 2017-01-01 17:16:43 +05:30
parent 763bfe3b27
commit f6c52c3d20
1 changed files with 43 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

53
src/pyj/read_book/toc.pyj
View File

@ -23,7 +23,45 @@ def iter_toc_nodes(node, callback):
if callback(child):
return
def get_highlighted_toc_nodes(toc, spine, parent_map, id_map):
def get_border_nodes(toc, id_map):
data = update_visible_toc_nodes.data
before, after = data.before, data.after
if before:
before = id_map[before]
if after:
after = id_map[after]
if before and after:
# Both border nodes are in the current spine item
return before, after
# Find the ToC entries that point to the closest files on either side of the
# current spine item
spine = get_boss().book.manifest.spine
spine_before, spine_after = {}, {}
which = spine_before
csi = current_spine_item()
for name in spine:
if name is csi:
which = spine_after
else:
which[name] = True
prev = None
iter_toc_nodes(toc, def(node):
nonlocal prev, before, after
if node.dest:
if spine_before[node.dest]:
prev = node.dest
elif spine_after[node.dest]:
if not before:
before = prev
if not after:
after = node
return True
)
return before, after
def get_highlighted_toc_nodes(toc, parent_map, id_map):
data = update_visible_toc_nodes.data
ans = {}
if data.has_visible:
@ -32,14 +70,9 @@ def get_highlighted_toc_nodes(toc, spine, parent_map, id_map):
if data.before:
ans[data.before] = True
else:
nodes_before = v'[]'
iter_toc_nodes(toc, def(node):
if node.dest is current_spine_item():
return True
nodes_before.push(node)
)
if nodes_before.length:
ans[nodes_before[-1].id] = True
before = get_border_nodes(toc, id_map)[0]
if before:
ans[before.id] = True
for node_id in Object.keys(ans):
pid = parent_map[node_id]
while pid:
@ -149,4 +182,4 @@ def update_visible_toc_anchors(toc_anchor_map, anchor_funcs):
after = anchor_id
break
return {'visible_anchors':visible_anchors, 'has_visible':has_visible, 'before':before, 'after':after}
return {'visible_anchors':visible_anchors, 'has_visible':has_visible, 'before':before, 'after':after, 'sorted_anchors':tam.sorted_anchors}