Merge branch 'master' into test

Makefile.am

@@ -941,7 +941,7 @@ espeak-ng-data/zhy_dict: src/espeak-ng phsource/phonemes.stamp dictsource/zhy_ru
 else
 espeak-ng-data/zhy_dict: src/espeak-ng phsource/phonemes.stamp dictsource/zhy_rules dictsource/zhy_extra
 endif
-	cd dictsource && ESPEAK_DATA_PATH=$(PWD) LD_LIBRARY_PATH=../src:${LD_LIBRARY_PATH} ../src/espeak-ng --compile=zhy && cd ..
+	cd dictsource && ESPEAK_DATA_PATH=$(PWD) LD_LIBRARY_PATH=../src:${LD_LIBRARY_PATH} ../src/espeak-ng --compile=yue && cd ..
 
 ##### mbrola:
 

README.md

@@ -1,7 +1,5 @@
 # eSpeak NG Text-to-Speech
 
-<div align="right"><a href="https://travis-ci.org/espeak-ng/espeak-ng" title="Travis continuous integration builds on Linux"><img src="https://secure.travis-ci.org/espeak-ng/espeak-ng.svg?branch=master"/></a></div>
-
 - [Windows](#windows)
   - [Binaries](#binaries)
   - [Building](#building)
@@ -37,6 +35,16 @@ sound.
 See the [CHANGELOG](CHANGELOG.md) for a description of the changes in the
 various releases and with the eSpeak project.
 
+The following platforms are supported:
+
+| Platform    | Minimum Version | Status |
+|-------------|-----------------|--------|
+| Linux       |                 | ![[Travis continuous integration builds on Linux](https://travis-ci.org/espeak-ng/espeak-ng)](https://secure.travis-ci.org/espeak-ng/espeak-ng.svg?branch=master) |
+| BSD         |                 |        |
+| Android     | 4.0             |        |
+| Windows     | Windows 8       |        |
+| Mac         |                 |        |
+
 ## Windows
 
 ### Binaries

android/jni/Android.mk

@@ -22,6 +22,7 @@ ESPEAK_SOURCES := \
   src/libespeak-ng/intonation.c \
   src/libespeak-ng/klatt.c \
   src/libespeak-ng/numbers.c \
+  src/libespeak-ng/phoneme.c \
   src/libespeak-ng/phonemelist.c \
   src/libespeak-ng/readclause.c \
   src/libespeak-ng/setlengths.c \

espeak-ng-data/lang/gmq/nb

@@ -1,5 +1,7 @@
 name Norwegian Bokmål
 language nb
 language no
+phonemes no
+dictionary no
 
 intonation 4

espeak-ng-data/lang/sit/cmn

@@ -2,6 +2,8 @@ name Chinese (Mandarin)
 language cmn
 language zh-cmn
 language zh
+phonemes zh
+dictionary zh
 words 1
 pitch 80 118