mjohnson/espeak-ng
1
0
Fork 0
mirror of https://github.com/rhasspy/espeak-ng.git synced 2026-11-03 14:17:12 +00:00
Code Issues Packages Projects Releases Wiki Activity

Use the new ucd-tools project for wide-character compatibility on Android.

Browse Source
This commit is contained in:
Reece H. Dunn
2012-12-22 01:54:37 +00:00
parent 0a37be30b2
commit 8bafda70e2
5 changed files with 16 additions and 4541 deletions
Download Patch File Download Diff File Expand all files Collapse all files
.gitmodules
+3
View File
@@ -0,0 +1,3 @@
[submodule "ucd-tools"]
path = ucd-tools
url = git@github.com:rhdunn/ucd-tools.git
android/jni/Android.mk
+3
View File
@@ -23,6 +23,8 @@ BLACKLIST_SRC_FILES := \
ESPEAK_SRC_PATH := ../../src
ESPEAK_SRC_FILES := \
$(LOCAL_PATH)/../../../ucd-tools/src/categories.cpp \
$(LOCAL_PATH)/../../../ucd-tools/src/ctype.cpp \
$(subst $(LOCAL_PATH)/$(ESPEAK_SRC_PATH),$(ESPEAK_SRC_PATH),$(wildcard $(LOCAL_PATH)/$(ESPEAK_SRC_PATH)/*.c*))
LOCAL_SRC_FILES += \
@@ -35,6 +37,7 @@ LOCAL_SRC_FILES += \
LOCAL_C_INCLUDES += \
$(LOCAL_PATH)/include \
$(LOCAL_PATH)/../../../ucd-tools/src/include \
$(LOCAL_PATH)/$(ESPEAK_SRC_PATH)
LOCAL_LDLIBS := \
src/android_wchar.cpp
-4522
View File
File diff suppressed because it is too large Load Diff
src/android_wchar.h
+9 -19
View File
@@ -25,26 +25,16 @@
#include <wchar.h>
#include <wctype.h>
enum android_wctype
{
android_wctype_upper = 0x01,
android_wctype_lower = 0x02,
android_wctype_digit = 0x04,
android_wctype_lettr = 0x08,
android_wctype_space = 0x10,
android_wctype_cntrl = 0x20,
android_wctype_punct = 0x40,
android_wctype_alpha = android_wctype_upper|android_wctype_lower|android_wctype_lettr,
android_wctype_alnum = android_wctype_alpha|android_wctype_digit,
};
#ifdef ANDROID
extern "C" android_wctype __android_wctype(wint_t c);
#include "ucd/ucd.h"
#define iswalpha(c) ((__android_wctype(c) & android_wctype_alpha) != 0)
#define iswalnum(c) ((__android_wctype(c) & android_wctype_alnum) != 0)
#define iswdigit(c) ((__android_wctype(c) & android_wctype_digit) != 0)
#define iswlower(c) ((__android_wctype(c) & android_wctype_lower) != 0)
#define iswspace(c) ((__android_wctype(c) & android_wctype_space) != 0)
#define iswupper(c) ((__android_wctype(c) & android_wctype_upper) != 0)
#define iswalpha(c) ucd::isalpha(c)
#define iswalnum(c) ucd::isalnum(c)
#define iswdigit(c) ucd::isdigit(c)
#define iswlower(c) ucd::islower(c)
#define iswspace(c) ucd::isspace(c)
#define iswupper(c) ucd::isupper(c)
#endif
#endif
ucd-tools
Submodule
+1
Submodule ucd-tools added at e3e85d33f2