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

Refactor for reuse

Browse Source
This commit is contained in:
Kovid Goyal 2014-07-05 15:48:48 +05:30
parent 45780c4719
commit 2dc956bbd7
1 changed files with 15 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -209,6 +209,20 @@ def ensure_not_within_tag_definition(cursor, forward=True):
return False return False
def find_closest_containing_block_tag(block, offset, block_tag_names=frozenset((
'address', 'article', 'aside', 'blockquote', 'center', 'dir',
'fieldset', 'isindex', 'menu', 'noframes', 'hgroup', 'noscript', 'pre',
'section', 'h1', 'h2', 'h3', 'h4', 'h5', 'h6', 'header', 'p', 'div', 'dd',
'dl', 'ul', 'ol', 'li', 'body', 'td', 'th'))):
while True:
tag = find_closest_containing_tag(block, offset)
if tag is None:
break
if tag.name in block_tag_names:
return tag
block, offset = tag.start_block, tag.start_offset
class HTMLSmarts(NullSmarts): class HTMLSmarts(NullSmarts):
def get_extra_selections(self, editor): def get_extra_selections(self, editor):
@ -241,21 +255,7 @@ class HTMLSmarts(NullSmarts):
editor.highlighter.join() editor.highlighter.join()
c = editor.textCursor() c = editor.textCursor()
block, offset = c.block(), c.positionInBlock() block, offset = c.block(), c.positionInBlock()
tag = None tag = find_closest_containing_block_tag(block, offset)
while True:
tag = find_closest_containing_tag(block, offset)
if tag is None:
break
block, offset = tag.start_block, tag.start_offset
if tag.name in {
'address', 'article', 'aside', 'blockquote', 'center',
'dir', 'fieldset', 'isindex', 'menu', 'noframes', 'hgroup',
'noscript', 'pre', 'section', 'h1', 'h2', 'h3', 'h4', 'h5',
'h6', 'header', 'p', 'div', 'dd', 'dl', 'ul', 'ol', 'li', 'body',
'td', 'th'}:
break
tag = None
if tag is not None: if tag is not None:
closing_tag = find_closing_tag(tag) closing_tag = find_closing_tag(tag)