Rename zhy (Cantonese) to yue across the codebase.

See discussion in #933.

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 $@ ; \

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}
 ])

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

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

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

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 ***
 

src/windows/data.vcxproj

@@ -322,8 +322,8 @@
   <Target Name="zh" Inputs="$(ProjectDir)..\..\dictsource\zh_rules;$(ProjectDir)..\..\dictsource\zh_list" Outputs="$(ProjectDir)..\..\espeak-ng-data\zh_dict" DependsOnTargets="Phonemes">
     <Exec Command="cd $(ProjectDir)..\..\dictsource &amp;&amp; $(TargetDir)espeak-ng.exe --path=$(ProjectDir)..\.. --compile=zh" />
   </Target>
-  <Target Name="zhy" Inputs="$(ProjectDir)..\..\dictsource\zhy_rules;$(ProjectDir)..\..\dictsource\zhy_list" Outputs="$(ProjectDir)..\..\espeak-ng-data\zhy_dict" DependsOnTargets="Phonemes">
+  <Target Name="yue" Inputs="$(ProjectDir)..\..\dictsource\yue_rules;$(ProjectDir)..\..\dictsource\yue_list" Outputs="$(ProjectDir)..\..\espeak-ng-data\yue_dict" DependsOnTargets="Phonemes">
     <Exec Command="cd $(ProjectDir)..\..\dictsource &amp;&amp; $(TargetDir)espeak-ng.exe --path=$(ProjectDir)..\.. --compile=yue" />
   </Target>
-  <Target Name="Dictionaries" DependsOnTargets="af;am;an;ar;as;az;bg;bn;bs;ca;cs;cy;da;de;el;en;eo;es;et;eu;fa;fi;fr;ga;gd;gn;grc;gu;hi;hr;hu;hy;ia;id;is;it;jbo;ja;ka;kl;kn;ko;ku;ky;la;lfn;lt;lv;mk;ml;mr;ms;mt;my;nci;ne;nl;no;om;or;pa;pap;pl;pt;ro;ru;si;sk;sl;sq;sr;sv;sw;ta;te;tn;tr;tt;ur;vi;zh;zhy" />
+  <Target Name="Dictionaries" DependsOnTargets="af;am;an;ar;as;az;bg;bn;bs;ca;cs;cy;da;de;el;en;eo;es;et;eu;fa;fi;fr;ga;gd;gn;grc;gu;hi;hr;hu;hy;ia;id;is;it;jbo;ja;ka;kl;kn;ko;ku;ky;la;lfn;lt;lv;mk;ml;mr;ms;mt;my;nci;ne;nl;no;om;or;pa;pap;pl;pt;ro;ru;si;sk;sl;sq;sr;sv;sw;ta;te;tn;tr;tt;ur;vi;yue;zh" />
 </Project>

src/windows/installer/Product.wxs

@@ -594,8 +594,8 @@
             <Component Id="zh_dict" Win64="$(var.Win64)" Guid="6DF6E437-BF8B-4FCD-B094-D88C65ACDE6E">
               <File Name="zh_dict" Source="$(var.ProjectDir)..\..\..\espeak-ng-data\zh_dict" KeyPath="yes"/>
             </Component>
-            <Component Id="zhy_dict" Win64="$(var.Win64)" Guid="D6BF57DA-A408-40FC-9D8E-610C8AED5836">
-              <File Name="zhy_dict" Source="$(var.ProjectDir)..\..\..\espeak-ng-data\zhy_dict" KeyPath="yes"/>
+            <Component Id="yue_dict" Win64="$(var.Win64)" Guid="D6BF57DA-A408-40FC-9D8E-610C8AED5836">
+              <File Name="yue_dict" Source="$(var.ProjectDir)..\..\..\espeak-ng-data\yue_dict" KeyPath="yes"/>
             </Component>
             <Directory Id="VOICES" Name="voices">
               <Directory Id="AAV" Name="aav">
@@ -1012,7 +1012,7 @@
     </ComponentGroup>
     <ComponentGroup Id="LangChineseCantonese">
       <ComponentRef Id="yue"/>
-      <ComponentRef Id="zhy_dict"/>
+      <ComponentRef Id="yue_dict"/>
     </ComponentGroup>
     <ComponentGroup Id="LangChineseMandarin">
       <ComponentRef Id="cmn"/>