mia/Aegisub
1
0
Fork 1
Code Issues Pull requests Projects Releases Wiki Activity

Properly ignore ASS whitespace characters in character counter

Browse source
This commit is contained in:
Ryan Lucia 2018-04-29 17:19:02 -04:00
parent 3eaa56fc18
commit 869cdcc7a1
1 changed files with 20 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

21
libaegisub/common/character_count.cpp
View file

@ -31,6 +31,8 @@ struct utext_deleter {
}; };
using utext_ptr = std::unique_ptr<UText, utext_deleter>; using utext_ptr = std::unique_ptr<UText, utext_deleter>;
UChar32 ass_special_chars[] = {'n', 'N', 'h'};
icu::BreakIterator& get_break_iterator(const char *ptr, size_t len) { icu::BreakIterator& get_break_iterator(const char *ptr, size_t len) {
static std::unique_ptr<icu::BreakIterator> bi; static std::unique_ptr<icu::BreakIterator> bi;
static std::once_flag token; static std::once_flag token;
@ -65,10 +67,25 @@ size_t count_in_range(Iterator begin, Iterator end, int mask) {
UChar32 c; UChar32 c;
int i = 0; int i = 0;
U8_NEXT_UNSAFE(begin + pos, i, c); U8_NEXT_UNSAFE(begin + pos, i, c);
if ((U_GET_GC_MASK(c) & mask) == 0) if ((U_GET_GC_MASK(c) & mask) == 0) {
if (mask & U_GC_Z_MASK && pos != 0) {
UChar32 *result = std::find(std::begin(ass_special_chars), std::end(ass_special_chars), c);
if (result != std::end(ass_special_chars)) {
UChar32 c2;
i = 0;
U8_PREV_UNSAFE(begin + pos, i, c2);
if (c2 != (UChar32) '\\')
++count;
else if (!(mask & U_GC_P_MASK))
--count;
}
else
++count; ++count;
} }
else
++count;
}
}
} }
return count; return count;
} }