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

.gitmodules

+[submodule "ucd-tools"]
+	path = ucd-tools
+	url = [email protected]:rhdunn/ucd-tools.git

android/jni/Android.mk

 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 += \
 
 LOCAL_C_INCLUDES += \
   $(LOCAL_PATH)/include \
+  $(LOCAL_PATH)/../../../ucd-tools/src/include \
   $(LOCAL_PATH)/$(ESPEAK_SRC_PATH)
 
 LOCAL_LDLIBS := \

src/android_wchar.h

 #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

+Subproject commit e3e85d33f2949cdb29fa1090c0165d6117aa9217