From 24d6cb90e77df1cac3077be8acc03dd7711ad0eb Mon Sep 17 00:00:00 2001 From: FRIGN Date: Thu, 12 Feb 2015 16:41:57 +0100 Subject: [PATCH] Amend isspacerune() properly with WS and S Unicode characters --- libutf/isspacerune.c | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) diff --git a/libutf/isspacerune.c b/libutf/isspacerune.c index 8d86d41..76783a4 100644 --- a/libutf/isspacerune.c +++ b/libutf/isspacerune.c @@ -4,13 +4,18 @@ #include "../utf.h" #include "runetype.h" +static Rune space3[][2] = { + { 0x0009, 0x000B }, +}; + static Rune space2[][2] = { + { 0x000B, 0x000C }, + { 0x001F, 0x0020 }, { 0x2000, 0x200A }, { 0x2028, 0x2029 }, }; static Rune space1[] = { - 0x0020, 0x00A0, 0x1680, 0x202F, @@ -21,6 +26,10 @@ static Rune space1[] = { int isspacerune(Rune r) { + Rune *match; + + if(match = bsearch(&r, space3, nelem(space3), sizeof *space3, &rune2cmp)) + return !((r - match[0]) % 2); if(bsearch(&r, space2, nelem(space2), sizeof *space2, &rune2cmp)) return 1; if(bsearch(&r, space1, nelem(space1), sizeof *space1, &rune1cmp))