Skip to content

Improve edge case for WF Hyphen search #1925

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
windymilla wants to merge 1 commit into
base: master
Choose a base branch
from
+6 −2
Open

Improve edge case for WF Hyphen search #1925

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 6 additions & 2 deletions src/guiguts/word_frequency.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -785,14 +785,18 @@ def goto_word(
# Also, boundary for an emdash is any non-emdash, but for other non-word characters the
# boundary is a word/space character
emdash_bound = "—" if newline_word[0] == "—" else r"[^\w\s]"
# If word contains space, then permit boundary character to be a hyphen
# (by not having it in the excluded characters)
# e.g. "school teacher" will match "Sunday-school teacher"
hyph_bound = "" if " " in newline_word else "-"
left_boundary = (
r"(?<!([^\W_]|[\p{L}\p{N}][-'’]))"
r"(?<!([^\W_]|[\p{L}\p{N}][" + hyph_bound + r"'’]))"
if newline_word[0].isalnum()
else rf"(?<!{emdash_bound})"
)
emdash_bound = "—" if newline_word[-1] == "—" else r"[^\w\s]"
right_boundary = (
r"(?!([^\W_]|[-'’][\p{L}\p{N}]))"
r"(?!([^\W_]|[" + hyph_bound + r"'’][\p{L}\p{N}]))"
if newline_word[-1].isalnum()
else rf"(?!{emdash_bound})"
)
Expand Down
Loading