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

E-book viewer: Fix an error when opening books with MathML for the second time if the last read position was at a MathML element. Fixes #1961775 [Private bug](https://bugs.launchpad.net/calibre/+bug/1961775)

Browse Source
This commit is contained in:
Kovid Goyal 2022-03-02 16:39:05 +05:30
parent 7431c7fe85
commit 4ebed6bbc1
No known key found for this signature in database
GPG Key ID: 06BC317B515ACE7C
1 changed files with 12 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
src/pyj/read_book/cfi.pyj
View File

@ -122,14 +122,14 @@ def text_length_in_range_wrapper(node):
while p: while p:
if is_text_node(p): if is_text_node(p):
ans += p.nodeValue.length ans += p.nodeValue.length
elif p.nodeType is Node.ELEMENT_NODE and p.dataset.calibreRangeWrapper: elif p.nodeType is Node.ELEMENT_NODE and p.dataset?.calibreRangeWrapper:
ans += text_length_in_range_wrapper(p) ans += text_length_in_range_wrapper(p)
p = p.nextSibling p = p.nextSibling
return ans return ans
def adjust_node_for_text_offset(node): def adjust_node_for_text_offset(node):
if node.parentNode and node.parentNode.dataset.calibreRangeWrapper: if node.parentNode and node.parentNode.dataset?.calibreRangeWrapper:
node = node.parentNode node = node.parentNode
offset = 0 offset = 0
adjusted = False adjusted = False
@ -139,11 +139,11 @@ def adjust_node_for_text_offset(node):
break break
if is_text_node(p): if is_text_node(p):
offset += p.nodeValue.length offset += p.nodeValue.length
elif p.nodeType is Node.ELEMENT_NODE and p.dataset.calibreRangeWrapper: elif p.nodeType is Node.ELEMENT_NODE and p.dataset?.calibreRangeWrapper:
offset += text_length_in_range_wrapper(p) offset += text_length_in_range_wrapper(p)
node = p node = p
adjusted = True adjusted = True
if adjusted and node.nodeType is Node.ELEMENT_NODE and node.dataset.calibreRangeWrapper: if adjusted and node.nodeType is Node.ELEMENT_NODE and node.dataset?.calibreRangeWrapper:
if not node.firstChild or node.firstChild.nodeType is not Node.TEXT_NODE: if not node.firstChild or node.firstChild.nodeType is not Node.TEXT_NODE:
node.insertBefore(document.createTextNode(''), node.firstChild or None) node.insertBefore(document.createTextNode(''), node.firstChild or None)
node = node.firstChild node = node.firstChild
@ -153,7 +153,7 @@ def adjust_node_for_text_offset(node):
def unwrapped_nodes(range_wrapper): def unwrapped_nodes(range_wrapper):
ans = v'[]' ans = v'[]'
for child in range_wrapper.childNodes: for child in range_wrapper.childNodes:
if child.nodeType is Node.ELEMENT_NODE and child.dataset.calibreRangeWrapper: if child.nodeType is Node.ELEMENT_NODE and child.dataset?.calibreRangeWrapper:
ans = ans.concat(unwrapped_nodes(child)) ans = ans.concat(unwrapped_nodes(child))
else: else:
ans.push(child) ans.push(child)
@ -162,7 +162,7 @@ def unwrapped_nodes(range_wrapper):
def increment_index_for_child(child, index, sentinel): def increment_index_for_child(child, index, sentinel):
is_element = child.nodeType is Node.ELEMENT_NODE is_element = child.nodeType is Node.ELEMENT_NODE
if is_element and child.dataset.calibreRangeWrapper: if is_element and child.dataset?.calibreRangeWrapper:
nodes = unwrapped_nodes(child) nodes = unwrapped_nodes(child)
index = increment_index_for_children(nodes, index, sentinel) index = increment_index_for_children(nodes, index, sentinel)
else: else:
@ -199,11 +199,11 @@ def encode(doc, node, offset, tail):
if q: if q:
if q.nodeType is Node.ELEMENT_NODE: if q.nodeType is Node.ELEMENT_NODE:
node = q node = q
if node.dataset.calibreRangeWrapper: if node.dataset?.calibreRangeWrapper:
if not node.firstChild: if not node.firstChild:
node.appendChild(document.createTextNode('')) node.appendChild(document.createTextNode(''))
node = node.firstChild node = node.firstChild
elif node.dataset.calibreRangeWrapper: elif node.dataset?.calibreRangeWrapper:
if not node.firstChild: if not node.firstChild:
node.appendChild(document.createTextNode('')) node.appendChild(document.createTextNode(''))
node = node.firstChild node = node.firstChild
@ -234,7 +234,7 @@ def encode(doc, node, offset, tail):
index = increment_index_for_children(p.childNodes, 0, sentinel) index = increment_index_for_children(p.childNodes, 0, sentinel)
if is_first: if is_first:
is_first = False is_first = False
if node.nodeType is Node.ELEMENT_NODE and node.dataset.calibreRangeWrapper: if node.nodeType is Node.ELEMENT_NODE and node.dataset?.calibreRangeWrapper:
index -= 1 index -= 1
# Add id assertions for robustness where possible # Add id assertions for robustness where possible
id = node.id id = node.id
@ -292,7 +292,8 @@ def node_for_text_offset(nodes, offset, first_node):
return node, offset, True return node, offset, True
last_text_node = node last_text_node = node
offset -= l offset -= l
elif node.nodeType is Node.ELEMENT_NODE and node.dataset.calibreRangeWrapper: # mathml nodes dont have dataset
elif node.nodeType is Node.ELEMENT_NODE and node.dataset?.calibreRangeWrapper:
qn, offset, ok = node_for_text_offset(unwrapped_nodes(node), offset) qn, offset, ok = node_for_text_offset(unwrapped_nodes(node), offset)
if ok: if ok:
return qn, offset, True return qn, offset, True
@ -389,7 +390,7 @@ def decode(cfi, doc):
# Find the text node that contains the offset # Find the text node that contains the offset
if offset is not None: if offset is not None:
orig_offset = offset orig_offset = offset
if node.parentNode?.nodeType is Node.ELEMENT_NODE and node.parentNode.dataset.calibreRangeWrapper: if node.parentNode?.nodeType is Node.ELEMENT_NODE and node.parentNode.dataset?.calibreRangeWrapper:
node = node.parentNode node = node.parentNode
qnode, offset, ok = node_for_text_offset(node.parentNode.childNodes, offset, node) qnode, offset, ok = node_for_text_offset(node.parentNode.childNodes, offset, node)
if not ok: if not ok: