diff options
Diffstat (limited to 'fitz')
| -rw-r--r-- | fitz/fitz.h | 2 | ||||
| -rw-r--r-- | fitz/text_search.c | 9 |
2 files changed, 9 insertions, 2 deletions
diff --git a/fitz/fitz.h b/fitz/fitz.h index 52264d92..8817672d 100644 --- a/fitz/fitz.h +++ b/fitz/fitz.h @@ -2292,7 +2292,7 @@ void fz_print_text_page(fz_context *ctx, fz_output *out, fz_text_page *page); NOTE: This is an experimental interface and subject to change without notice. */ -int fz_search_text_page(fz_context *ctx, fz_text_page *text, char *needle, fz_rect *hit_bbox, int hit_max); +int fz_search_text_page(fz_context *ctx, fz_text_page *text, const char *needle, fz_rect *hit_bbox, int hit_max); /* fz_highlight_selection: Return a list of rectangles to highlight given a selection rectangle. diff --git a/fitz/text_search.c b/fitz/text_search.c index 6631535b..9b0a3acf 100644 --- a/fitz/text_search.c +++ b/fitz/text_search.c @@ -103,9 +103,16 @@ static int match(fz_text_page *page, const char *s, int n) s += fz_chartorune(&c, (char *)s); if (iswhite(c) && iswhite(charat(page, n))) { + const char *s_next; + + /* Skip over whitespace in the document */ do n++; while (iswhite(charat(page, n))); + + /* Skip over multiple whitespace in the search string */ + while (s_next = s + fz_chartorune(&c, (char *)s), iswhite(c)) + s = s_next; } else { @@ -118,7 +125,7 @@ static int match(fz_text_page *page, const char *s, int n) } int -fz_search_text_page(fz_context *ctx, fz_text_page *text, char *needle, fz_rect *hit_bbox, int hit_max) +fz_search_text_page(fz_context *ctx, fz_text_page *text, const char *needle, fz_rect *hit_bbox, int hit_max) { int pos, len, i, n, hit_count; |