diff --git a/Makefile.am b/Makefile.am
index 35effd64..559458fe 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -434,8 +434,8 @@ phsource/phonemes.stamp: \
phsource/ph_welsh \
phsource/ph_wolof \
phsource/ph_yoruba \
+ phsource/ph_yue \
phsource/ph_zh \
- phsource/ph_zh_yue \
phsource/phonemes \
src/espeak-ng
ESPEAK_DATA_PATH=$(CURDIR) src/espeak-ng --compile-intonations && \
@@ -599,8 +599,8 @@ dictionaries: \
espeak-ng-data/ur_dict \
espeak-ng-data/uz_dict \
espeak-ng-data/vi_dict \
- espeak-ng-data/zh_dict \
- espeak-ng-data/zhy_dict
+ espeak-ng-data/yue_dict \
+ espeak-ng-data/zh_dict
af: espeak-ng-data/af_dict
espeak-ng-data/af_dict: dictsource/af_list dictsource/af_rules dictsource/af_extra dictsource/af_emoji
@@ -943,17 +943,17 @@ else
espeak-ng-data/zh_dict: dictsource/zh_list dictsource/zh_rules dictsource/zh_extra dictsource/zh_emoji
endif
-zhy: espeak-ng-data/zhy_dict
-dictsource/zhy_listx:
- ln -svf extra/zhy_listx dictsource/
-if HAVE_ZHY_EXTENDED_DICTIONARY
-espeak-ng-data/zhy_dict: dictsource/zhy_list dictsource/zhy_rules dictsource/zhy_extra dictsource/zhy_listx dictsource/zhy_emoji
+yue: espeak-ng-data/yue_dict
+dictsource/yue_listx:
+ ln -svf extra/yue_listx dictsource/
+if HAVE_YUE_EXTENDED_DICTIONARY
+espeak-ng-data/yue_dict: dictsource/yue_list dictsource/yue_rules dictsource/yue_extra dictsource/yue_listx dictsource/yue_emoji
else
-espeak-ng-data/zhy_dict: dictsource/zhy_list dictsource/zhy_rules dictsource/zhy_extra dictsource/zhy_emoji
+espeak-ng-data/yue_dict: dictsource/yue_list dictsource/yue_rules dictsource/yue_extra dictsource/yue_emoji
endif
cd dictsource && ESPEAK_DATA_PATH=$(CURDIR) LD_LIBRARY_PATH=../src:${LD_LIBRARY_PATH} ../src/espeak-ng --compile=yue && cd ..
-dictsource/zhy_emoji:
+dictsource/yue_emoji:
@echo " EMOJI $@"
@if test x"${CLDR_PATH}" = x ; then \
touch $@ ; \
diff --git a/configure.ac b/configure.ac
index 92fe5ac4..9074357b 100644
--- a/configure.ac
+++ b/configure.ac
@@ -56,8 +56,8 @@ AC_ARG_WITH([extdict-zh],
[AS_HELP_STRING([--with-extdict-zh], [use the extended Mandarin Chinese Dictionary file @<:@default=no@:>@])],
[])
-AC_ARG_WITH([extdict-zhy],
- [AS_HELP_STRING([--with-extdict-zhy], [use the extended Cantonese Chinese Dictionary file @<:@default=no@:>@])],
+AC_ARG_WITH([extdict-yue],
+ [AS_HELP_STRING([--with-extdict-yue], [use the extended Cantonese Chinese Dictionary file @<:@default=no@:>@])],
[])
AC_ARG_WITH([libfuzzer],
@@ -287,15 +287,15 @@ else
have_extdict_zh=no
fi
-if test "$with_extdict_zhy" = "yes" ; then
- have_extdict_zhy=yes
+if test "$with_extdict_yue" = "yes" ; then
+ have_extdict_yue=yes
else
- have_extdict_zhy=no
+ have_extdict_yue=no
fi
AM_CONDITIONAL(HAVE_RU_EXTENDED_DICTIONARY, [test x"$have_extdict_ru" = xyes])
AM_CONDITIONAL(HAVE_ZH_EXTENDED_DICTIONARY, [test x"$have_extdict_zh" = xyes])
-AM_CONDITIONAL(HAVE_ZHY_EXTENDED_DICTIONARY, [test x"$have_extdict_zhy" = xyes])
+AM_CONDITIONAL(HAVE_YUE_EXTENDED_DICTIONARY, [test x"$have_extdict_yue" = xyes])
dnl ================================================================
dnl Compiler warnings.
@@ -360,5 +360,5 @@ AC_MSG_NOTICE([
Extended Dictionaries:
Russian: ${have_extdict_ru}
Chinese (Mandarin): ${have_extdict_zh}
- Chinese (Cantonese): ${have_extdict_zhy}
+ Chinese (Cantonese): ${have_extdict_yue}
])
diff --git a/dictsource/extra/zhy_listx b/dictsource/extra/yue_listx
similarity index 99%
rename from dictsource/extra/zhy_listx
rename to dictsource/extra/yue_listx
index 2044641e..0032b9e0 100644
--- a/dictsource/extra/zhy_listx
+++ b/dictsource/extra/yue_listx
@@ -1,4 +1,4 @@
-// zhy_list - the Cantonese dictionary file for eSpeak and Ekho
+// yue_list - the Cantonese dictionary file for eSpeak and Ekho
// Maintainer: Cameron Wong, hgneng at gmail.com
// Website: http://www.eguidedog.net/cantonese.php
// License: Creative Commons Attribution-Share Alike 3.0
diff --git a/dictsource/zhy_emoji b/dictsource/yue_emoji
similarity index 100%
rename from dictsource/zhy_emoji
rename to dictsource/yue_emoji
diff --git a/dictsource/zhy_list b/dictsource/yue_list
similarity index 100%
rename from dictsource/zhy_list
rename to dictsource/yue_list
diff --git a/dictsource/zhy_rules b/dictsource/yue_rules
similarity index 100%
rename from dictsource/zhy_rules
rename to dictsource/yue_rules
diff --git a/docs/building.md b/docs/building.md
index b5c0fe64..da4031ee 100644
--- a/docs/building.md
+++ b/docs/building.md
@@ -210,7 +210,7 @@ to build:
|----------------------|---------------------|---------|
| `--with-extdict-ru` | Russian | no |
| `--with-extdict-zh` | Mandarin Chinese | no |
-| `--with-extdict-zhy` | Cantonese | no |
+| `--with-extdict-yue` | Cantonese | no |
The extended dictionaries are taken from
[http://espeak.sourceforge.net/data/](http://espeak.sourceforge.net/data/) and
diff --git a/espeak-ng-data/lang/sit/yue b/espeak-ng-data/lang/sit/yue
index c4c0c58d..d65fac1f 100644
--- a/espeak-ng-data/lang/sit/yue
+++ b/espeak-ng-data/lang/sit/yue
@@ -3,8 +3,8 @@ language yue
language zh-yue
language zh 8
-phonemes zhy
-dictionary zhy
+phonemes yue
+dictionary yue
// interpret English letters as 1=English words, 2=jyutping
dictrules 1
diff --git a/phsource/ph_zh_yue b/phsource/ph_yue
similarity index 100%
rename from phsource/ph_zh_yue
rename to phsource/ph_yue
diff --git a/phsource/phonemes b/phsource/phonemes
index 18d7588e..08628738 100644
--- a/phsource/phonemes
+++ b/phsource/phonemes
@@ -1817,8 +1817,8 @@ include ph_wolof
phonemetable zh base1
include ph_zh
-phonemetable zhy base1
-include ph_zh_yue
+phonemetable yue base1
+include ph_yue
// *** Tables extending base2 ***
diff --git a/src/windows/data.vcxproj b/src/windows/data.vcxproj
index 31501581..a170bef0 100644
--- a/src/windows/data.vcxproj
+++ b/src/windows/data.vcxproj
@@ -322,8 +322,8 @@
-
+
-
+
diff --git a/src/windows/installer/Product.wxs b/src/windows/installer/Product.wxs
index a91b0d8f..a581cc6c 100644
--- a/src/windows/installer/Product.wxs
+++ b/src/windows/installer/Product.wxs
@@ -594,8 +594,8 @@
-
-
+
+
@@ -1012,7 +1012,7 @@
-
+