mantarimay/Aegisub
1
0
Fork 0
forked from mia/Aegisub
Code Pull requests Activity

Use ICU for checking if characters are whitespace

Browse source
This commit is contained in:
Thomas Goyne 2013-02-05 18:20:22 -08:00
parent 9f2fdb2a86
commit 48921c35e0
2 changed files with 4 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
aegisub/src/utils.cpp
View file

@ -54,6 +54,7 @@
#include <boost/locale/boundary.hpp>
#include <boost/range/algorithm_ext.hpp>
#include <map>
#include <unicode/uchar.h>
#include <wx/clipbrd.h>
#include <wx/filedlg.h>
@ -108,15 +109,8 @@ int SmallestPowerOf2(int x) {
return x;
}
bool IsWhitespace(wchar_t c) {
const wchar_t whitespaces[] = {
// http://en.wikipedia.org/wiki/Space_(punctuation)#Table_of_spaces
0x0009, 0x000A, 0x000B, 0x000C, 0x000D, 0x0020, 0x0085, 0x00A0,
0x1680, 0x180E, 0x2000, 0x2001, 0x2002, 0x2003, 0x2004, 0x2005,
0x2006, 0x2007, 0x2008, 0x2009, 0x200A, 0x2028, 0x2029, 0x202F,
0x025F, 0x3000, 0xFEFF
};
return std::binary_search(whitespaces, std::end(whitespaces), c);
bool IsWhitespace(wxUniChar c) {
return !!u_isUWhiteSpace(c.GetValue());
}
bool StringEmptyOrWhitespace(const wxString &str) {

2
aegisub/src/utils.h
View file

@ -62,7 +62,7 @@ void StatusTimeout(wxString const& msg, int ms = 10000);
int SmallestPowerOf2(int x);
/// Check if wchar 'c' is a whitespace character
bool IsWhitespace(wchar_t c);
bool IsWhitespace(wxUniChar c);
/// Check if every character in str is whitespace
bool StringEmptyOrWhitespace(const wxString &str);