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

Edit Book: Fix position syncing and Live CSS not working if the opening tag is split over multiple lines

Browse Source
This commit is contained in:
Kovid Goyal 2014-08-07 11:50:12 +05:30
parent e72325ab99
commit 454f2e03a8
1 changed files with 14 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
src/calibre/gui2/tweak_book/editor/smart/html.py
View File

@ -421,6 +421,11 @@ class HTMLSmarts(NullSmarts):
start_block, start_offset = block, boundary.offset start_block, start_offset = block, boundary.offset
break break
block, offset = block.previous(), sys.maxint block, offset = block.previous(), sys.maxint
end_block = None
if start_block is not None:
end_block, boundary = next_tag_boundary(start_block, start_offset)
if boundary is None or boundary.is_start:
return None, None
else: else:
tag = None tag = None
if use_matched_tag: if use_matched_tag:
@ -429,15 +434,19 @@ class HTMLSmarts(NullSmarts):
tag = find_closest_containing_tag(block, offset, max_tags=2000) tag = find_closest_containing_tag(block, offset, max_tags=2000)
if tag is None: if tag is None:
return None, None return None, None
start_block, start_offset = tag.start_block, tag.start_offset start_block, start_offset, end_block = tag.start_block, tag.start_offset, tag.end_block
if start_block is None: if start_block is None or end_block is None:
return None, None return None, None
sourceline = start_block.blockNumber() + 1 # blockNumber() is zero based sourceline = end_block.blockNumber() + 1 # blockNumber() is zero based
ud = start_block.userData() ud = start_block.userData()
if ud is None: if ud is None:
return None, None return None, None
return sourceline, [ tags = [t.name for t in ud.tags if (t.is_start and not t.closing and t.offset <= start_offset)]
t.name for t in ud.tags if (t.is_start and not t.closing and t.offset <= start_offset)] if start_block.blockNumber() != end_block.blockNumber():
# Multiline opening tag, it must be the first tag with on the line
# with the closing >
del tags[:-1]
return sourceline, tags
def goto_sourceline(self, editor, sourceline, tags, attribute=None): def goto_sourceline(self, editor, sourceline, tags, attribute=None):
''' Move the cursor to the tag identified by sourceline and tags (a ''' Move the cursor to the tag identified by sourceline and tags (a