diff --git a/.gitignore b/.gitignore index 9b8cce14..1e9681f2 100644 --- a/.gitignore +++ b/.gitignore @@ -99,7 +99,7 @@ License.txt ReadMe Makefile -# espeak-data +# espeak-ng-data dictsource/*_extra dictsource/dict_log @@ -114,13 +114,13 @@ phsource/error_intonation phsource/error_log phsource/phonemes.stamp -espeak-data/config -espeak-data/dictsource -espeak-data/phsource -espeak-data/*_dict -espeak-data/mbrola_ph/*_phtrans -espeak-data/intonations -espeak-data/phondata -espeak-data/phondata-manifest -espeak-data/phonindex -espeak-data/phontab +espeak-ng-data/config +espeak-ng-data/dictsource +espeak-ng-data/phsource +espeak-ng-data/*_dict +espeak-ng-data/mbrola_ph/*_phtrans +espeak-ng-data/intonations +espeak-ng-data/phondata +espeak-ng-data/phondata-manifest +espeak-ng-data/phonindex +espeak-ng-data/phontab diff --git a/CHANGELOG.md b/CHANGELOG.md index 43aa1b29..9ff53986 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,6 +1,6 @@ # Change Log -## (In Development) +## 1.49.0 - 2016-09-10 * Support the `--compile-mbrola` command-line option. * Support the `--compile-phonemes` command-line option. @@ -16,6 +16,9 @@ * Removed support for WinCE, MS-DOS and RiscOS. * Add support for `maintainer` and `status` field in voice files for tracking voice maintenance. +* Vim syntax highlighting for espeak dictionary (list and rules) files. +* Support reading input from named pipes. +* Fix wav file truncation when reading multiline text from stdin or a named pipe. build: @@ -75,6 +78,7 @@ updated languages: new languages: * gn (Guarani) -- ChrisLeo +* ky (Kyrgyz) -- JRMeyer * mb-br2 (Brazillian Portuguese) * mb-de\* (German) : extend support coverage of the German MBROLA voices * mb-lt1 (Lithuanian) -- embar diff --git a/Makefile.am b/Makefile.am index ba32899f..11e3a51b 100644 --- a/Makefile.am +++ b/Makefile.am @@ -5,7 +5,7 @@ PREFIX=@prefix@ BINDIR=@bindir@ INCDIR=@includedir@/espeak LIBDIR=@libdir@ -DATADIR=$(PREFIX)/share/espeak-data +DATADIR=$(PREFIX)/share/espeak-ng-data VIMDIR=$(PREFIX)/share/vim pkgconfigdir = $(libdir)/pkgconfig @@ -37,7 +37,7 @@ EXTRA_DIST += ChangeLog ##### standard build actions: all-local: \ - espeak-data/phontab \ + espeak-ng-data/phontab \ dictionaries \ mbrola @@ -46,7 +46,7 @@ uninstall-hook: install-data-hook: uninstall-hook $(MKDIR) $(DESTDIR)$(DATADIR) - cp -prf espeak-data/* $(DESTDIR)$(DATADIR) + cp -prf espeak-ng-data/* $(DESTDIR)$(DATADIR) install-exec-hook: cd $(DESTDIR)$(BINDIR) && rm -f espeak && $(LN_S) espeak-ng espeak @@ -57,8 +57,8 @@ clean-local: cd src && rm -f *.o *~ && cd .. distclean-local: - rm -rf espeak-data/phondata-manifest - rm -f espeak-data/*_dict + rm -rf espeak-ng-data/phondata-manifest + rm -f espeak-ng-data/*_dict ##### custom rules: @@ -190,11 +190,11 @@ src_espeak_ng_SOURCES = src/espeak-ng.c ##### phoneme data: -espeak-data/phondata: phsource/phonemes.stamp -espeak-data/phondata-manifest: phsource/phonemes.stamp -espeak-data/phonindex: phsource/phonemes.stamp -espeak-data/phontab: phsource/phonemes.stamp -espeak-data/intonations: phsource/phonemes.stamp +espeak-ng-data/phondata: phsource/phonemes.stamp +espeak-ng-data/phondata-manifest: phsource/phonemes.stamp +espeak-ng-data/phonindex: phsource/phonemes.stamp +espeak-ng-data/phontab: phsource/phonemes.stamp +espeak-ng-data/intonations: phsource/phonemes.stamp phsource/phonemes.stamp: \ phsource/ph_afrikaans \ @@ -307,750 +307,750 @@ phsource/phonemes.stamp: \ ##### dictionaries: dictionaries: \ - espeak-data/af_dict \ - espeak-data/am_dict \ - espeak-data/an_dict \ - espeak-data/as_dict \ - espeak-data/az_dict \ - espeak-data/bg_dict \ - espeak-data/bn_dict \ - espeak-data/ca_dict \ - espeak-data/cs_dict \ - espeak-data/cy_dict \ - espeak-data/da_dict \ - espeak-data/de_dict \ - espeak-data/el_dict \ - espeak-data/en_dict \ - espeak-data/eo_dict \ - espeak-data/es_dict \ - espeak-data/et_dict \ - espeak-data/eu_dict \ - espeak-data/fa_dict \ - espeak-data/fi_dict \ - espeak-data/fr_dict \ - espeak-data/ga_dict \ - espeak-data/gd_dict \ - espeak-data/grc_dict \ - espeak-data/gu_dict \ - espeak-data/hbs_dict \ - espeak-data/hi_dict \ - espeak-data/hu_dict \ - espeak-data/hy_dict \ - espeak-data/ia_dict \ - espeak-data/id_dict \ - espeak-data/is_dict \ - espeak-data/it_dict \ - espeak-data/jbo_dict \ - espeak-data/ka_dict \ - espeak-data/kl_dict \ - espeak-data/kn_dict \ - espeak-data/ko_dict \ - espeak-data/ku_dict \ - espeak-data/ky_dict \ - espeak-data/la_dict \ - espeak-data/lfn_dict \ - espeak-data/lt_dict \ - espeak-data/lv_dict \ - espeak-data/mk_dict \ - espeak-data/ml_dict \ - espeak-data/mr_dict \ - espeak-data/ms_dict \ - espeak-data/mt_dict \ - espeak-data/my_dict \ - espeak-data/nci_dict \ - espeak-data/ne_dict \ - espeak-data/nl_dict \ - espeak-data/no_dict \ - espeak-data/om_dict \ - espeak-data/or_dict \ - espeak-data/pa_dict \ - espeak-data/pap_dict \ - espeak-data/pl_dict \ - espeak-data/pt_dict \ - espeak-data/ro_dict \ - espeak-data/ru_dict \ - espeak-data/si_dict \ - espeak-data/sk_dict \ - espeak-data/sl_dict \ - espeak-data/sq_dict \ - espeak-data/sv_dict \ - espeak-data/sw_dict \ - espeak-data/ta_dict \ - espeak-data/te_dict \ - espeak-data/tn_dict \ - espeak-data/tr_dict \ - espeak-data/tt_dict \ - espeak-data/ur_dict \ - espeak-data/vi_dict \ - espeak-data/zh_dict \ - espeak-data/zhy_dict + espeak-ng-data/af_dict \ + espeak-ng-data/am_dict \ + espeak-ng-data/an_dict \ + espeak-ng-data/as_dict \ + espeak-ng-data/az_dict \ + espeak-ng-data/bg_dict \ + espeak-ng-data/bn_dict \ + espeak-ng-data/ca_dict \ + espeak-ng-data/cs_dict \ + espeak-ng-data/cy_dict \ + espeak-ng-data/da_dict \ + espeak-ng-data/de_dict \ + espeak-ng-data/el_dict \ + espeak-ng-data/en_dict \ + espeak-ng-data/eo_dict \ + espeak-ng-data/es_dict \ + espeak-ng-data/et_dict \ + espeak-ng-data/eu_dict \ + espeak-ng-data/fa_dict \ + espeak-ng-data/fi_dict \ + espeak-ng-data/fr_dict \ + espeak-ng-data/ga_dict \ + espeak-ng-data/gd_dict \ + espeak-ng-data/grc_dict \ + espeak-ng-data/gu_dict \ + espeak-ng-data/hbs_dict \ + espeak-ng-data/hi_dict \ + espeak-ng-data/hu_dict \ + espeak-ng-data/hy_dict \ + espeak-ng-data/ia_dict \ + espeak-ng-data/id_dict \ + espeak-ng-data/is_dict \ + espeak-ng-data/it_dict \ + espeak-ng-data/jbo_dict \ + espeak-ng-data/ka_dict \ + espeak-ng-data/kl_dict \ + espeak-ng-data/kn_dict \ + espeak-ng-data/ko_dict \ + espeak-ng-data/ku_dict \ + espeak-ng-data/ky_dict \ + espeak-ng-data/la_dict \ + espeak-ng-data/lfn_dict \ + espeak-ng-data/lt_dict \ + espeak-ng-data/lv_dict \ + espeak-ng-data/mk_dict \ + espeak-ng-data/ml_dict \ + espeak-ng-data/mr_dict \ + espeak-ng-data/ms_dict \ + espeak-ng-data/mt_dict \ + espeak-ng-data/my_dict \ + espeak-ng-data/nci_dict \ + espeak-ng-data/ne_dict \ + espeak-ng-data/nl_dict \ + espeak-ng-data/no_dict \ + espeak-ng-data/om_dict \ + espeak-ng-data/or_dict \ + espeak-ng-data/pa_dict \ + espeak-ng-data/pap_dict \ + espeak-ng-data/pl_dict \ + espeak-ng-data/pt_dict \ + espeak-ng-data/ro_dict \ + espeak-ng-data/ru_dict \ + espeak-ng-data/si_dict \ + espeak-ng-data/sk_dict \ + espeak-ng-data/sl_dict \ + espeak-ng-data/sq_dict \ + espeak-ng-data/sv_dict \ + espeak-ng-data/sw_dict \ + espeak-ng-data/ta_dict \ + espeak-ng-data/te_dict \ + espeak-ng-data/tn_dict \ + espeak-ng-data/tr_dict \ + espeak-ng-data/tt_dict \ + espeak-ng-data/ur_dict \ + espeak-ng-data/vi_dict \ + espeak-ng-data/zh_dict \ + espeak-ng-data/zhy_dict -af: espeak-data/af_dict +af: espeak-ng-data/af_dict dictsource/af_extra: touch dictsource/af_extra -espeak-data/af_dict: src/espeak-ng phsource/phonemes.stamp dictsource/af_list dictsource/af_rules dictsource/af_extra +espeak-ng-data/af_dict: src/espeak-ng phsource/phonemes.stamp dictsource/af_list dictsource/af_rules dictsource/af_extra cd dictsource && ESPEAK_DATA_PATH=$(PWD) LD_LIBRARY_PATH=../src:${LD_LIBRARY_PATH} ../src/espeak-ng --compile=af && cd .. -am: espeak-data/am_dict +am: espeak-ng-data/am_dict dictsource/am_extra: touch dictsource/am_extra -espeak-data/am_dict: src/espeak-ng phsource/phonemes.stamp dictsource/am_list dictsource/am_rules dictsource/am_extra +espeak-ng-data/am_dict: src/espeak-ng phsource/phonemes.stamp dictsource/am_list dictsource/am_rules dictsource/am_extra cd dictsource && ESPEAK_DATA_PATH=$(PWD) LD_LIBRARY_PATH=../src:${LD_LIBRARY_PATH} ../src/espeak-ng --compile=am && cd .. -an: espeak-data/an_dict +an: espeak-ng-data/an_dict dictsource/an_extra: touch dictsource/an_extra -espeak-data/an_dict: src/espeak-ng phsource/phonemes.stamp dictsource/an_list dictsource/an_rules dictsource/an_extra +espeak-ng-data/an_dict: src/espeak-ng phsource/phonemes.stamp dictsource/an_list dictsource/an_rules dictsource/an_extra cd dictsource && ESPEAK_DATA_PATH=$(PWD) LD_LIBRARY_PATH=../src:${LD_LIBRARY_PATH} ../src/espeak-ng --compile=an && cd .. -as: espeak-data/as_dict +as: espeak-ng-data/as_dict dictsource/as_extra: touch dictsource/as_extra -espeak-data/as_dict: src/espeak-ng phsource/phonemes.stamp dictsource/as_list dictsource/as_rules dictsource/as_extra +espeak-ng-data/as_dict: src/espeak-ng phsource/phonemes.stamp dictsource/as_list dictsource/as_rules dictsource/as_extra cd dictsource && ESPEAK_DATA_PATH=$(PWD) LD_LIBRARY_PATH=../src:${LD_LIBRARY_PATH} ../src/espeak-ng --compile=as && cd .. -az: espeak-data/az_dict +az: espeak-ng-data/az_dict dictsource/az_extra: touch dictsource/az_extra -espeak-data/az_dict: src/espeak-ng phsource/phonemes.stamp dictsource/az_list dictsource/az_rules dictsource/az_extra +espeak-ng-data/az_dict: src/espeak-ng phsource/phonemes.stamp dictsource/az_list dictsource/az_rules dictsource/az_extra cd dictsource && ESPEAK_DATA_PATH=$(PWD) LD_LIBRARY_PATH=../src:${LD_LIBRARY_PATH} ../src/espeak-ng --compile=az && cd .. -bg: espeak-data/bg_dict +bg: espeak-ng-data/bg_dict dictsource/bg_extra: touch dictsource/bg_extra -espeak-data/bg_dict: src/espeak-ng phsource/phonemes.stamp dictsource/bg_list dictsource/bg_listx dictsource/bg_rules dictsource/bg_extra +espeak-ng-data/bg_dict: src/espeak-ng phsource/phonemes.stamp dictsource/bg_list dictsource/bg_listx dictsource/bg_rules dictsource/bg_extra cd dictsource && ESPEAK_DATA_PATH=$(PWD) LD_LIBRARY_PATH=../src:${LD_LIBRARY_PATH} ../src/espeak-ng --compile=bg && cd .. -bn: espeak-data/bn_dict +bn: espeak-ng-data/bn_dict dictsource/bn_extra: touch dictsource/bn_extra -espeak-data/bn_dict: src/espeak-ng phsource/phonemes.stamp dictsource/bn_list dictsource/bn_rules dictsource/bn_extra +espeak-ng-data/bn_dict: src/espeak-ng phsource/phonemes.stamp dictsource/bn_list dictsource/bn_rules dictsource/bn_extra cd dictsource && ESPEAK_DATA_PATH=$(PWD) LD_LIBRARY_PATH=../src:${LD_LIBRARY_PATH} ../src/espeak-ng --compile=bn && cd .. -ca: espeak-data/ca_dict +ca: espeak-ng-data/ca_dict dictsource/ca_extra: touch dictsource/ca_extra -espeak-data/ca_dict: src/espeak-ng phsource/phonemes.stamp dictsource/ca_list dictsource/ca_rules dictsource/ca_extra +espeak-ng-data/ca_dict: src/espeak-ng phsource/phonemes.stamp dictsource/ca_list dictsource/ca_rules dictsource/ca_extra cd dictsource && ESPEAK_DATA_PATH=$(PWD) LD_LIBRARY_PATH=../src:${LD_LIBRARY_PATH} ../src/espeak-ng --compile=ca && cd .. -cs: espeak-data/cs_dict +cs: espeak-ng-data/cs_dict dictsource/cs_extra: touch dictsource/cs_extra -espeak-data/cs_dict: src/espeak-ng phsource/phonemes.stamp dictsource/cs_list dictsource/cs_rules dictsource/cs_extra +espeak-ng-data/cs_dict: src/espeak-ng phsource/phonemes.stamp dictsource/cs_list dictsource/cs_rules dictsource/cs_extra cd dictsource && ESPEAK_DATA_PATH=$(PWD) LD_LIBRARY_PATH=../src:${LD_LIBRARY_PATH} ../src/espeak-ng --compile=cs && cd .. -cy: espeak-data/cy_dict +cy: espeak-ng-data/cy_dict dictsource/cy_extra: touch dictsource/cy_extra -espeak-data/cy_dict: src/espeak-ng phsource/phonemes.stamp dictsource/cy_list dictsource/cy_rules dictsource/cy_extra +espeak-ng-data/cy_dict: src/espeak-ng phsource/phonemes.stamp dictsource/cy_list dictsource/cy_rules dictsource/cy_extra cd dictsource && ESPEAK_DATA_PATH=$(PWD) LD_LIBRARY_PATH=../src:${LD_LIBRARY_PATH} ../src/espeak-ng --compile=cy && cd .. -da: espeak-data/da_dict +da: espeak-ng-data/da_dict dictsource/da_extra: touch dictsource/da_extra -espeak-data/da_dict: src/espeak-ng phsource/phonemes.stamp dictsource/da_list dictsource/da_rules dictsource/da_extra +espeak-ng-data/da_dict: src/espeak-ng phsource/phonemes.stamp dictsource/da_list dictsource/da_rules dictsource/da_extra cd dictsource && ESPEAK_DATA_PATH=$(PWD) LD_LIBRARY_PATH=../src:${LD_LIBRARY_PATH} ../src/espeak-ng --compile=da && cd .. -de: espeak-data/de_dict +de: espeak-ng-data/de_dict dictsource/de_extra: touch dictsource/de_extra -espeak-data/de_dict: src/espeak-ng phsource/phonemes.stamp dictsource/de_list dictsource/de_rules dictsource/de_extra +espeak-ng-data/de_dict: src/espeak-ng phsource/phonemes.stamp dictsource/de_list dictsource/de_rules dictsource/de_extra cd dictsource && ESPEAK_DATA_PATH=$(PWD) LD_LIBRARY_PATH=../src:${LD_LIBRARY_PATH} ../src/espeak-ng --compile=de && cd .. -el: espeak-data/el_dict +el: espeak-ng-data/el_dict dictsource/el_extra: touch dictsource/el_extra -espeak-data/el_dict: src/espeak-ng phsource/phonemes.stamp dictsource/el_list dictsource/el_rules dictsource/el_extra +espeak-ng-data/el_dict: src/espeak-ng phsource/phonemes.stamp dictsource/el_list dictsource/el_rules dictsource/el_extra cd dictsource && ESPEAK_DATA_PATH=$(PWD) LD_LIBRARY_PATH=../src:${LD_LIBRARY_PATH} ../src/espeak-ng --compile=el && cd .. -en: espeak-data/en_dict +en: espeak-ng-data/en_dict dictsource/en_extra: touch dictsource/en_extra -espeak-data/en_dict: src/espeak-ng phsource/phonemes.stamp dictsource/en_list dictsource/en_rules dictsource/en_extra +espeak-ng-data/en_dict: src/espeak-ng phsource/phonemes.stamp dictsource/en_list dictsource/en_rules dictsource/en_extra cd dictsource && ESPEAK_DATA_PATH=$(PWD) LD_LIBRARY_PATH=../src:${LD_LIBRARY_PATH} ../src/espeak-ng --compile=en && cd .. -eo: espeak-data/eo_dict +eo: espeak-ng-data/eo_dict dictsource/eo_extra: touch dictsource/eo_extra -espeak-data/eo_dict: src/espeak-ng phsource/phonemes.stamp dictsource/eo_list dictsource/eo_rules dictsource/eo_extra +espeak-ng-data/eo_dict: src/espeak-ng phsource/phonemes.stamp dictsource/eo_list dictsource/eo_rules dictsource/eo_extra cd dictsource && ESPEAK_DATA_PATH=$(PWD) LD_LIBRARY_PATH=../src:${LD_LIBRARY_PATH} ../src/espeak-ng --compile=eo && cd .. -es: espeak-data/es_dict +es: espeak-ng-data/es_dict dictsource/es_extra: touch dictsource/es_extra -espeak-data/es_dict: src/espeak-ng phsource/phonemes.stamp dictsource/es_list dictsource/es_rules dictsource/es_extra +espeak-ng-data/es_dict: src/espeak-ng phsource/phonemes.stamp dictsource/es_list dictsource/es_rules dictsource/es_extra cd dictsource && ESPEAK_DATA_PATH=$(PWD) LD_LIBRARY_PATH=../src:${LD_LIBRARY_PATH} ../src/espeak-ng --compile=es && cd .. -et: espeak-data/et_dict +et: espeak-ng-data/et_dict dictsource/et_extra: touch dictsource/et_extra -espeak-data/et_dict: src/espeak-ng phsource/phonemes.stamp dictsource/et_list dictsource/et_rules dictsource/et_extra +espeak-ng-data/et_dict: src/espeak-ng phsource/phonemes.stamp dictsource/et_list dictsource/et_rules dictsource/et_extra cd dictsource && ESPEAK_DATA_PATH=$(PWD) LD_LIBRARY_PATH=../src:${LD_LIBRARY_PATH} ../src/espeak-ng --compile=et && cd .. -eu: espeak-data/eu_dict +eu: espeak-ng-data/eu_dict dictsource/eu_extra: touch dictsource/eu_extra -espeak-data/eu_dict: src/espeak-ng phsource/phonemes.stamp dictsource/eu_list dictsource/eu_rules dictsource/eu_extra +espeak-ng-data/eu_dict: src/espeak-ng phsource/phonemes.stamp dictsource/eu_list dictsource/eu_rules dictsource/eu_extra cd dictsource && ESPEAK_DATA_PATH=$(PWD) LD_LIBRARY_PATH=../src:${LD_LIBRARY_PATH} ../src/espeak-ng --compile=eu && cd .. -fa: espeak-data/fa_dict +fa: espeak-ng-data/fa_dict dictsource/fa_extra: touch dictsource/fa_extra -espeak-data/fa_dict: src/espeak-ng phsource/phonemes.stamp dictsource/fa_list dictsource/fa_rules dictsource/fa_extra +espeak-ng-data/fa_dict: src/espeak-ng phsource/phonemes.stamp dictsource/fa_list dictsource/fa_rules dictsource/fa_extra cd dictsource && ESPEAK_DATA_PATH=$(PWD) LD_LIBRARY_PATH=../src:${LD_LIBRARY_PATH} ../src/espeak-ng --compile=fa && cd .. -fi: espeak-data/fi_dict +fi: espeak-ng-data/fi_dict dictsource/fi_extra: touch dictsource/fi_extra -espeak-data/fi_dict: src/espeak-ng phsource/phonemes.stamp dictsource/fi_list dictsource/fi_rules dictsource/fi_extra +espeak-ng-data/fi_dict: src/espeak-ng phsource/phonemes.stamp dictsource/fi_list dictsource/fi_rules dictsource/fi_extra cd dictsource && ESPEAK_DATA_PATH=$(PWD) LD_LIBRARY_PATH=../src:${LD_LIBRARY_PATH} ../src/espeak-ng --compile=fi && cd .. -fr: espeak-data/fr_dict +fr: espeak-ng-data/fr_dict dictsource/fr_extra: touch dictsource/fr_extra -espeak-data/fr_dict: src/espeak-ng phsource/phonemes.stamp dictsource/fr_list dictsource/fr_rules dictsource/fr_extra +espeak-ng-data/fr_dict: src/espeak-ng phsource/phonemes.stamp dictsource/fr_list dictsource/fr_rules dictsource/fr_extra cd dictsource && ESPEAK_DATA_PATH=$(PWD) LD_LIBRARY_PATH=../src:${LD_LIBRARY_PATH} ../src/espeak-ng --compile=fr && cd .. -ga: espeak-data/ga_dict +ga: espeak-ng-data/ga_dict dictsource/ga_extra: touch dictsource/ga_extra -espeak-data/ga_dict: src/espeak-ng phsource/phonemes.stamp dictsource/ga_list dictsource/ga_rules dictsource/ga_extra +espeak-ng-data/ga_dict: src/espeak-ng phsource/phonemes.stamp dictsource/ga_list dictsource/ga_rules dictsource/ga_extra cd dictsource && ESPEAK_DATA_PATH=$(PWD) LD_LIBRARY_PATH=../src:${LD_LIBRARY_PATH} ../src/espeak-ng --compile=ga && cd .. -gd: espeak-data/gd_dict +gd: espeak-ng-data/gd_dict dictsource/gd_extra: touch dictsource/gd_extra -espeak-data/gd_dict: src/espeak-ng phsource/phonemes.stamp dictsource/gd_list dictsource/gd_rules dictsource/gd_extra +espeak-ng-data/gd_dict: src/espeak-ng phsource/phonemes.stamp dictsource/gd_list dictsource/gd_rules dictsource/gd_extra cd dictsource && ESPEAK_DATA_PATH=$(PWD) LD_LIBRARY_PATH=../src:${LD_LIBRARY_PATH} ../src/espeak-ng --compile=gd && cd .. -gn: espeak-data/gn_dict +gn: espeak-ng-data/gn_dict dictsource/gn_extra: touch dictsource/gn_extra -espeak-data/gn_dict: src/espeak-ng phsource/phonemes.stamp dictsource/gn_list dictsource/gn_rules dictsource/gn_extra +espeak-ng-data/gn_dict: src/espeak-ng phsource/phonemes.stamp dictsource/gn_list dictsource/gn_rules dictsource/gn_extra cd dictsource && ESPEAK_DATA_PATH=$(PWD) LD_LIBRARY_PATH=../src:${LD_LIBRARY_PATH} ../src/espeak-ng --compile=gn && cd .. -grc: espeak-data/grc_dict +grc: espeak-ng-data/grc_dict dictsource/grc_extra: touch dictsource/grc_extra -espeak-data/grc_dict: src/espeak-ng phsource/phonemes.stamp dictsource/grc_list dictsource/grc_rules dictsource/grc_extra +espeak-ng-data/grc_dict: src/espeak-ng phsource/phonemes.stamp dictsource/grc_list dictsource/grc_rules dictsource/grc_extra cd dictsource && ESPEAK_DATA_PATH=$(PWD) LD_LIBRARY_PATH=../src:${LD_LIBRARY_PATH} ../src/espeak-ng --compile=grc && cd .. -gu: espeak-data/gu_dict +gu: espeak-ng-data/gu_dict dictsource/gu_extra: touch dictsource/gu_extra -espeak-data/gu_dict: src/espeak-ng phsource/phonemes.stamp dictsource/gu_list dictsource/gu_rules dictsource/gu_extra +espeak-ng-data/gu_dict: src/espeak-ng phsource/phonemes.stamp dictsource/gu_list dictsource/gu_rules dictsource/gu_extra cd dictsource && ESPEAK_DATA_PATH=$(PWD) LD_LIBRARY_PATH=../src:${LD_LIBRARY_PATH} ../src/espeak-ng --compile=gu && cd .. -hbs: espeak-data/hbs_dict +hbs: espeak-ng-data/hbs_dict dictsource/hbs_extra: touch dictsource/hbs_extra -espeak-data/hbs_dict: src/espeak-ng phsource/phonemes.stamp dictsource/hbs_list dictsource/hbs_rules dictsource/hbs_extra +espeak-ng-data/hbs_dict: src/espeak-ng phsource/phonemes.stamp dictsource/hbs_list dictsource/hbs_rules dictsource/hbs_extra cd dictsource && ESPEAK_DATA_PATH=$(PWD) LD_LIBRARY_PATH=../src:${LD_LIBRARY_PATH} ../src/espeak-ng --compile=hbs && cd .. -hi: espeak-data/hi_dict +hi: espeak-ng-data/hi_dict dictsource/hi_extra: touch dictsource/hi_extra -espeak-data/hi_dict: src/espeak-ng phsource/phonemes.stamp dictsource/hi_list dictsource/hi_rules dictsource/hi_extra +espeak-ng-data/hi_dict: src/espeak-ng phsource/phonemes.stamp dictsource/hi_list dictsource/hi_rules dictsource/hi_extra cd dictsource && ESPEAK_DATA_PATH=$(PWD) LD_LIBRARY_PATH=../src:${LD_LIBRARY_PATH} ../src/espeak-ng --compile=hi && cd .. -hu: espeak-data/hu_dict +hu: espeak-ng-data/hu_dict dictsource/hu_extra: touch dictsource/hu_extra -espeak-data/hu_dict: src/espeak-ng phsource/phonemes.stamp dictsource/hu_list dictsource/hu_rules dictsource/hu_extra +espeak-ng-data/hu_dict: src/espeak-ng phsource/phonemes.stamp dictsource/hu_list dictsource/hu_rules dictsource/hu_extra cd dictsource && ESPEAK_DATA_PATH=$(PWD) LD_LIBRARY_PATH=../src:${LD_LIBRARY_PATH} ../src/espeak-ng --compile=hu && cd .. -hy: espeak-data/hy_dict +hy: espeak-ng-data/hy_dict dictsource/hy_extra: touch dictsource/hy_extra -espeak-data/hy_dict: src/espeak-ng phsource/phonemes.stamp dictsource/hy_list dictsource/hy_rules dictsource/hy_extra +espeak-ng-data/hy_dict: src/espeak-ng phsource/phonemes.stamp dictsource/hy_list dictsource/hy_rules dictsource/hy_extra cd dictsource && ESPEAK_DATA_PATH=$(PWD) LD_LIBRARY_PATH=../src:${LD_LIBRARY_PATH} ../src/espeak-ng --compile=hy && cd .. -ia: espeak-data/ia_dict +ia: espeak-ng-data/ia_dict dictsource/ia_extra: touch dictsource/ia_extra -espeak-data/ia_dict: src/espeak-ng phsource/phonemes.stamp dictsource/ia_list dictsource/ia_rules dictsource/ia_extra +espeak-ng-data/ia_dict: src/espeak-ng phsource/phonemes.stamp dictsource/ia_list dictsource/ia_rules dictsource/ia_extra cd dictsource && ESPEAK_DATA_PATH=$(PWD) LD_LIBRARY_PATH=../src:${LD_LIBRARY_PATH} ../src/espeak-ng --compile=ia && cd .. -id: espeak-data/id_dict +id: espeak-ng-data/id_dict dictsource/id_extra: touch dictsource/id_extra -espeak-data/id_dict: src/espeak-ng phsource/phonemes.stamp dictsource/id_list dictsource/id_rules dictsource/id_extra +espeak-ng-data/id_dict: src/espeak-ng phsource/phonemes.stamp dictsource/id_list dictsource/id_rules dictsource/id_extra cd dictsource && ESPEAK_DATA_PATH=$(PWD) LD_LIBRARY_PATH=../src:${LD_LIBRARY_PATH} ../src/espeak-ng --compile=id && cd .. -is: espeak-data/is_dict +is: espeak-ng-data/is_dict dictsource/is_extra: touch dictsource/is_extra -espeak-data/is_dict: src/espeak-ng phsource/phonemes.stamp dictsource/is_list dictsource/is_rules dictsource/is_extra +espeak-ng-data/is_dict: src/espeak-ng phsource/phonemes.stamp dictsource/is_list dictsource/is_rules dictsource/is_extra cd dictsource && ESPEAK_DATA_PATH=$(PWD) LD_LIBRARY_PATH=../src:${LD_LIBRARY_PATH} ../src/espeak-ng --compile=is && cd .. -it: espeak-data/it_dict +it: espeak-ng-data/it_dict dictsource/it_extra: touch dictsource/it_extra -espeak-data/it_dict: src/espeak-ng phsource/phonemes.stamp dictsource/it_list dictsource/it_listx dictsource/it_rules dictsource/it_extra +espeak-ng-data/it_dict: src/espeak-ng phsource/phonemes.stamp dictsource/it_list dictsource/it_listx dictsource/it_rules dictsource/it_extra cd dictsource && ESPEAK_DATA_PATH=$(PWD) LD_LIBRARY_PATH=../src:${LD_LIBRARY_PATH} ../src/espeak-ng --compile=it && cd .. -jbo: espeak-data/jbo_dict +jbo: espeak-ng-data/jbo_dict dictsource/jbo_extra: touch dictsource/jbo_extra -espeak-data/jbo_dict: src/espeak-ng phsource/phonemes.stamp dictsource/jbo_list dictsource/jbo_rules dictsource/jbo_extra +espeak-ng-data/jbo_dict: src/espeak-ng phsource/phonemes.stamp dictsource/jbo_list dictsource/jbo_rules dictsource/jbo_extra cd dictsource && ESPEAK_DATA_PATH=$(PWD) LD_LIBRARY_PATH=../src:${LD_LIBRARY_PATH} ../src/espeak-ng --compile=jbo && cd .. -ka: espeak-data/ka_dict +ka: espeak-ng-data/ka_dict dictsource/ka_extra: touch dictsource/ka_extra -espeak-data/ka_dict: src/espeak-ng phsource/phonemes.stamp dictsource/ka_list dictsource/ka_rules dictsource/ka_extra +espeak-ng-data/ka_dict: src/espeak-ng phsource/phonemes.stamp dictsource/ka_list dictsource/ka_rules dictsource/ka_extra cd dictsource && ESPEAK_DATA_PATH=$(PWD) LD_LIBRARY_PATH=../src:${LD_LIBRARY_PATH} ../src/espeak-ng --compile=ka && cd .. -kl: espeak-data/kl_dict +kl: espeak-ng-data/kl_dict dictsource/kl_extra: touch dictsource/kl_extra -espeak-data/kl_dict: src/espeak-ng phsource/phonemes.stamp dictsource/kl_list dictsource/kl_rules dictsource/kl_extra +espeak-ng-data/kl_dict: src/espeak-ng phsource/phonemes.stamp dictsource/kl_list dictsource/kl_rules dictsource/kl_extra cd dictsource && ESPEAK_DATA_PATH=$(PWD) LD_LIBRARY_PATH=../src:${LD_LIBRARY_PATH} ../src/espeak-ng --compile=kl && cd .. -kn: espeak-data/kn_dict +kn: espeak-ng-data/kn_dict dictsource/kn_extra: touch dictsource/kn_extra -espeak-data/kn_dict: src/espeak-ng phsource/phonemes.stamp dictsource/kn_list dictsource/kn_rules dictsource/kn_extra +espeak-ng-data/kn_dict: src/espeak-ng phsource/phonemes.stamp dictsource/kn_list dictsource/kn_rules dictsource/kn_extra cd dictsource && ESPEAK_DATA_PATH=$(PWD) LD_LIBRARY_PATH=../src:${LD_LIBRARY_PATH} ../src/espeak-ng --compile=kn && cd .. -ko: espeak-data/ko_dict +ko: espeak-ng-data/ko_dict dictsource/ko_extra: touch dictsource/ko_extra -espeak-data/ko_dict: src/espeak-ng phsource/phonemes.stamp dictsource/ko_list dictsource/ko_rules dictsource/ko_extra +espeak-ng-data/ko_dict: src/espeak-ng phsource/phonemes.stamp dictsource/ko_list dictsource/ko_rules dictsource/ko_extra cd dictsource && ESPEAK_DATA_PATH=$(PWD) LD_LIBRARY_PATH=../src:${LD_LIBRARY_PATH} ../src/espeak-ng --compile=ko && cd .. -ku: espeak-data/ku_dict +ku: espeak-ng-data/ku_dict dictsource/ku_extra: touch dictsource/ku_extra -espeak-data/ku_dict: src/espeak-ng phsource/phonemes.stamp dictsource/ku_list dictsource/ku_rules dictsource/ku_extra +espeak-ng-data/ku_dict: src/espeak-ng phsource/phonemes.stamp dictsource/ku_list dictsource/ku_rules dictsource/ku_extra cd dictsource && ESPEAK_DATA_PATH=$(PWD) LD_LIBRARY_PATH=../src:${LD_LIBRARY_PATH} ../src/espeak-ng --compile=ku && cd .. -ky: espeak-data/ky_dict +ky: espeak-ng-data/ky_dict dictsource/ky_extra: touch dictsource/ky_extra -espeak-data/ky_dict: src/espeak-ng phsource/phonemes.stamp dictsource/ky_list dictsource/ky_rules dictsource/ky_extra +espeak-ng-data/ky_dict: src/espeak-ng phsource/phonemes.stamp dictsource/ky_list dictsource/ky_rules dictsource/ky_extra cd dictsource && ESPEAK_DATA_PATH=$(PWD) LD_LIBRARY_PATH=../src:${LD_LIBRARY_PATH} ../src/espeak-ng --compile=ky && cd .. -la: espeak-data/la_dict +la: espeak-ng-data/la_dict dictsource/la_extra: touch dictsource/la_extra -espeak-data/la_dict: src/espeak-ng phsource/phonemes.stamp dictsource/la_list dictsource/la_rules dictsource/la_extra +espeak-ng-data/la_dict: src/espeak-ng phsource/phonemes.stamp dictsource/la_list dictsource/la_rules dictsource/la_extra cd dictsource && ESPEAK_DATA_PATH=$(PWD) LD_LIBRARY_PATH=../src:${LD_LIBRARY_PATH} ../src/espeak-ng --compile=la && cd .. -lfn: espeak-data/lfn_dict +lfn: espeak-ng-data/lfn_dict dictsource/lfn_extra: touch dictsource/lfn_extra -espeak-data/lfn_dict: src/espeak-ng phsource/phonemes.stamp dictsource/lfn_list dictsource/lfn_rules dictsource/lfn_extra +espeak-ng-data/lfn_dict: src/espeak-ng phsource/phonemes.stamp dictsource/lfn_list dictsource/lfn_rules dictsource/lfn_extra cd dictsource && ESPEAK_DATA_PATH=$(PWD) LD_LIBRARY_PATH=../src:${LD_LIBRARY_PATH} ../src/espeak-ng --compile=lfn && cd .. -lt: espeak-data/lt_dict +lt: espeak-ng-data/lt_dict dictsource/lt_extra: touch dictsource/lt_extra -espeak-data/lt_dict: src/espeak-ng phsource/phonemes.stamp dictsource/lt_list dictsource/lt_rules dictsource/lt_extra +espeak-ng-data/lt_dict: src/espeak-ng phsource/phonemes.stamp dictsource/lt_list dictsource/lt_rules dictsource/lt_extra cd dictsource && ESPEAK_DATA_PATH=$(PWD) LD_LIBRARY_PATH=../src:${LD_LIBRARY_PATH} ../src/espeak-ng --compile=lt && cd .. -lv: espeak-data/lv_dict +lv: espeak-ng-data/lv_dict dictsource/lv_extra: touch dictsource/lv_extra -espeak-data/lv_dict: src/espeak-ng phsource/phonemes.stamp dictsource/lv_list dictsource/lv_rules dictsource/lv_extra +espeak-ng-data/lv_dict: src/espeak-ng phsource/phonemes.stamp dictsource/lv_list dictsource/lv_rules dictsource/lv_extra cd dictsource && ESPEAK_DATA_PATH=$(PWD) LD_LIBRARY_PATH=../src:${LD_LIBRARY_PATH} ../src/espeak-ng --compile=lv && cd .. -mk: espeak-data/mk_dict +mk: espeak-ng-data/mk_dict dictsource/mk_extra: touch dictsource/mk_extra -espeak-data/mk_dict: src/espeak-ng phsource/phonemes.stamp dictsource/mk_list dictsource/mk_rules dictsource/mk_extra +espeak-ng-data/mk_dict: src/espeak-ng phsource/phonemes.stamp dictsource/mk_list dictsource/mk_rules dictsource/mk_extra cd dictsource && ESPEAK_DATA_PATH=$(PWD) LD_LIBRARY_PATH=../src:${LD_LIBRARY_PATH} ../src/espeak-ng --compile=mk && cd .. -ml: espeak-data/ml_dict +ml: espeak-ng-data/ml_dict dictsource/ml_extra: touch dictsource/ml_extra -espeak-data/ml_dict: src/espeak-ng phsource/phonemes.stamp dictsource/ml_list dictsource/ml_rules dictsource/ml_extra +espeak-ng-data/ml_dict: src/espeak-ng phsource/phonemes.stamp dictsource/ml_list dictsource/ml_rules dictsource/ml_extra cd dictsource && ESPEAK_DATA_PATH=$(PWD) LD_LIBRARY_PATH=../src:${LD_LIBRARY_PATH} ../src/espeak-ng --compile=ml && cd .. -mr: espeak-data/mr_dict +mr: espeak-ng-data/mr_dict dictsource/mr_extra: touch dictsource/mr_extra -espeak-data/mr_dict: src/espeak-ng phsource/phonemes.stamp dictsource/mr_list dictsource/mr_rules dictsource/mr_extra +espeak-ng-data/mr_dict: src/espeak-ng phsource/phonemes.stamp dictsource/mr_list dictsource/mr_rules dictsource/mr_extra cd dictsource && ESPEAK_DATA_PATH=$(PWD) LD_LIBRARY_PATH=../src:${LD_LIBRARY_PATH} ../src/espeak-ng --compile=mr && cd .. -ms: espeak-data/ms_dict +ms: espeak-ng-data/ms_dict dictsource/ms_extra: touch dictsource/ms_extra -espeak-data/ms_dict: src/espeak-ng phsource/phonemes.stamp dictsource/ms_list dictsource/ms_rules dictsource/ms_extra +espeak-ng-data/ms_dict: src/espeak-ng phsource/phonemes.stamp dictsource/ms_list dictsource/ms_rules dictsource/ms_extra cd dictsource && ESPEAK_DATA_PATH=$(PWD) LD_LIBRARY_PATH=../src:${LD_LIBRARY_PATH} ../src/espeak-ng --compile=ms && cd .. -mt: espeak-data/mt_dict +mt: espeak-ng-data/mt_dict dictsource/mt_extra: touch dictsource/mt_extra -espeak-data/mt_dict: src/espeak-ng phsource/phonemes.stamp dictsource/mt_list dictsource/mt_rules dictsource/mt_extra +espeak-ng-data/mt_dict: src/espeak-ng phsource/phonemes.stamp dictsource/mt_list dictsource/mt_rules dictsource/mt_extra cd dictsource && ESPEAK_DATA_PATH=$(PWD) LD_LIBRARY_PATH=../src:${LD_LIBRARY_PATH} ../src/espeak-ng --compile=mt && cd .. -my: espeak-data/my_dict +my: espeak-ng-data/my_dict dictsource/my_extra: touch dictsource/my_extra -espeak-data/my_dict: src/espeak-ng phsource/phonemes.stamp dictsource/my_list dictsource/my_rules dictsource/my_extra +espeak-ng-data/my_dict: src/espeak-ng phsource/phonemes.stamp dictsource/my_list dictsource/my_rules dictsource/my_extra cd dictsource && ESPEAK_DATA_PATH=$(PWD) LD_LIBRARY_PATH=../src:${LD_LIBRARY_PATH} ../src/espeak-ng --compile=my && cd .. -nci: espeak-data/nci_dict +nci: espeak-ng-data/nci_dict dictsource/nci_extra: touch dictsource/nci_extra -espeak-data/nci_dict: src/espeak-ng phsource/phonemes.stamp dictsource/nci_list dictsource/nci_rules dictsource/nci_extra +espeak-ng-data/nci_dict: src/espeak-ng phsource/phonemes.stamp dictsource/nci_list dictsource/nci_rules dictsource/nci_extra cd dictsource && ESPEAK_DATA_PATH=$(PWD) LD_LIBRARY_PATH=../src:${LD_LIBRARY_PATH} ../src/espeak-ng --compile=nci && cd .. -ne: espeak-data/ne_dict +ne: espeak-ng-data/ne_dict dictsource/ne_extra: touch dictsource/ne_extra -espeak-data/ne_dict: src/espeak-ng phsource/phonemes.stamp dictsource/ne_list dictsource/ne_rules dictsource/ne_extra +espeak-ng-data/ne_dict: src/espeak-ng phsource/phonemes.stamp dictsource/ne_list dictsource/ne_rules dictsource/ne_extra cd dictsource && ESPEAK_DATA_PATH=$(PWD) LD_LIBRARY_PATH=../src:${LD_LIBRARY_PATH} ../src/espeak-ng --compile=ne && cd .. -nl: espeak-data/nl_dict +nl: espeak-ng-data/nl_dict dictsource/nl_extra: touch dictsource/nl_extra -espeak-data/nl_dict: src/espeak-ng phsource/phonemes.stamp dictsource/nl_list dictsource/nl_rules dictsource/nl_extra +espeak-ng-data/nl_dict: src/espeak-ng phsource/phonemes.stamp dictsource/nl_list dictsource/nl_rules dictsource/nl_extra cd dictsource && ESPEAK_DATA_PATH=$(PWD) LD_LIBRARY_PATH=../src:${LD_LIBRARY_PATH} ../src/espeak-ng --compile=nl && cd .. -no: espeak-data/no_dict +no: espeak-ng-data/no_dict dictsource/no_extra: touch dictsource/no_extra -espeak-data/no_dict: src/espeak-ng phsource/phonemes.stamp dictsource/no_list dictsource/no_rules dictsource/no_extra +espeak-ng-data/no_dict: src/espeak-ng phsource/phonemes.stamp dictsource/no_list dictsource/no_rules dictsource/no_extra cd dictsource && ESPEAK_DATA_PATH=$(PWD) LD_LIBRARY_PATH=../src:${LD_LIBRARY_PATH} ../src/espeak-ng --compile=no && cd .. -om: espeak-data/om_dict +om: espeak-ng-data/om_dict dictsource/om_extra: touch dictsource/om_extra -espeak-data/om_dict: src/espeak-ng phsource/phonemes.stamp dictsource/om_list dictsource/om_rules dictsource/om_extra +espeak-ng-data/om_dict: src/espeak-ng phsource/phonemes.stamp dictsource/om_list dictsource/om_rules dictsource/om_extra cd dictsource && ESPEAK_DATA_PATH=$(PWD) LD_LIBRARY_PATH=../src:${LD_LIBRARY_PATH} ../src/espeak-ng --compile=om && cd .. -or: espeak-data/or_dict +or: espeak-ng-data/or_dict dictsource/or_extra: touch dictsource/or_extra -espeak-data/or_dict: src/espeak-ng phsource/phonemes.stamp dictsource/or_list dictsource/or_rules dictsource/or_extra +espeak-ng-data/or_dict: src/espeak-ng phsource/phonemes.stamp dictsource/or_list dictsource/or_rules dictsource/or_extra cd dictsource && ESPEAK_DATA_PATH=$(PWD) LD_LIBRARY_PATH=../src:${LD_LIBRARY_PATH} ../src/espeak-ng --compile=or && cd .. -pa: espeak-data/pa_dict +pa: espeak-ng-data/pa_dict dictsource/pa_extra: touch dictsource/pa_extra -espeak-data/pa_dict: src/espeak-ng phsource/phonemes.stamp dictsource/pa_list dictsource/pa_rules dictsource/pa_extra +espeak-ng-data/pa_dict: src/espeak-ng phsource/phonemes.stamp dictsource/pa_list dictsource/pa_rules dictsource/pa_extra cd dictsource && ESPEAK_DATA_PATH=$(PWD) LD_LIBRARY_PATH=../src:${LD_LIBRARY_PATH} ../src/espeak-ng --compile=pa && cd .. -pap: espeak-data/pap_dict +pap: espeak-ng-data/pap_dict dictsource/pap_extra: touch dictsource/pap_extra -espeak-data/pap_dict: src/espeak-ng phsource/phonemes.stamp dictsource/pap_list dictsource/pap_rules dictsource/pap_extra +espeak-ng-data/pap_dict: src/espeak-ng phsource/phonemes.stamp dictsource/pap_list dictsource/pap_rules dictsource/pap_extra cd dictsource && ESPEAK_DATA_PATH=$(PWD) LD_LIBRARY_PATH=../src:${LD_LIBRARY_PATH} ../src/espeak-ng --compile=pap && cd .. -pl: espeak-data/pl_dict +pl: espeak-ng-data/pl_dict dictsource/pl_extra: touch dictsource/pl_extra -espeak-data/pl_dict: src/espeak-ng phsource/phonemes.stamp dictsource/pl_list dictsource/pl_rules dictsource/pl_extra +espeak-ng-data/pl_dict: src/espeak-ng phsource/phonemes.stamp dictsource/pl_list dictsource/pl_rules dictsource/pl_extra cd dictsource && ESPEAK_DATA_PATH=$(PWD) LD_LIBRARY_PATH=../src:${LD_LIBRARY_PATH} ../src/espeak-ng --compile=pl && cd .. -pt: espeak-data/pt_dict +pt: espeak-ng-data/pt_dict dictsource/pt_extra: touch dictsource/pt_extra -espeak-data/pt_dict: src/espeak-ng phsource/phonemes.stamp dictsource/pt_list dictsource/pt_rules dictsource/pt_extra +espeak-ng-data/pt_dict: src/espeak-ng phsource/phonemes.stamp dictsource/pt_list dictsource/pt_rules dictsource/pt_extra cd dictsource && ESPEAK_DATA_PATH=$(PWD) LD_LIBRARY_PATH=../src:${LD_LIBRARY_PATH} ../src/espeak-ng --compile=pt && cd .. -ro: espeak-data/ro_dict +ro: espeak-ng-data/ro_dict dictsource/ro_extra: touch dictsource/ro_extra -espeak-data/ro_dict: src/espeak-ng phsource/phonemes.stamp dictsource/ro_list dictsource/ro_rules dictsource/ro_extra +espeak-ng-data/ro_dict: src/espeak-ng phsource/phonemes.stamp dictsource/ro_list dictsource/ro_rules dictsource/ro_extra cd dictsource && ESPEAK_DATA_PATH=$(PWD) LD_LIBRARY_PATH=../src:${LD_LIBRARY_PATH} ../src/espeak-ng --compile=ro && cd .. -ru: espeak-data/ru_dict +ru: espeak-ng-data/ru_dict dictsource/ru_extra: touch dictsource/ru_extra dictsource/ru_listx: ln -svf extra/ru_listx dictsource/ if HAVE_RU_EXTENDED_DICTIONARY -espeak-data/ru_dict: src/espeak-ng phsource/phonemes.stamp dictsource/ru_list dictsource/ru_rules dictsource/ru_extra dictsource/ru_listx +espeak-ng-data/ru_dict: src/espeak-ng phsource/phonemes.stamp dictsource/ru_list dictsource/ru_rules dictsource/ru_extra dictsource/ru_listx else -espeak-data/ru_dict: src/espeak-ng phsource/phonemes.stamp dictsource/ru_list dictsource/ru_rules dictsource/ru_extra +espeak-ng-data/ru_dict: src/espeak-ng phsource/phonemes.stamp dictsource/ru_list dictsource/ru_rules dictsource/ru_extra endif cd dictsource && ESPEAK_DATA_PATH=$(PWD) LD_LIBRARY_PATH=../src:${LD_LIBRARY_PATH} ../src/espeak-ng --compile=ru && cd .. -si: espeak-data/si_dict +si: espeak-ng-data/si_dict dictsource/si_extra: touch dictsource/si_extra -espeak-data/si_dict: src/espeak-ng phsource/phonemes.stamp dictsource/si_list dictsource/si_rules dictsource/si_extra +espeak-ng-data/si_dict: src/espeak-ng phsource/phonemes.stamp dictsource/si_list dictsource/si_rules dictsource/si_extra cd dictsource && ESPEAK_DATA_PATH=$(PWD) LD_LIBRARY_PATH=../src:${LD_LIBRARY_PATH} ../src/espeak-ng --compile=si && cd .. -sk: espeak-data/sk_dict +sk: espeak-ng-data/sk_dict dictsource/sk_extra: touch dictsource/sk_extra -espeak-data/sk_dict: src/espeak-ng phsource/phonemes.stamp dictsource/sk_list dictsource/sk_rules dictsource/sk_extra +espeak-ng-data/sk_dict: src/espeak-ng phsource/phonemes.stamp dictsource/sk_list dictsource/sk_rules dictsource/sk_extra cd dictsource && ESPEAK_DATA_PATH=$(PWD) LD_LIBRARY_PATH=../src:${LD_LIBRARY_PATH} ../src/espeak-ng --compile=sk && cd .. -sl: espeak-data/sl_dict +sl: espeak-ng-data/sl_dict dictsource/sl_extra: touch dictsource/sl_extra -espeak-data/sl_dict: src/espeak-ng phsource/phonemes.stamp dictsource/sl_list dictsource/sl_rules dictsource/sl_extra +espeak-ng-data/sl_dict: src/espeak-ng phsource/phonemes.stamp dictsource/sl_list dictsource/sl_rules dictsource/sl_extra cd dictsource && ESPEAK_DATA_PATH=$(PWD) LD_LIBRARY_PATH=../src:${LD_LIBRARY_PATH} ../src/espeak-ng --compile=sl && cd .. -sq: espeak-data/sq_dict +sq: espeak-ng-data/sq_dict dictsource/sq_extra: touch dictsource/sq_extra -espeak-data/sq_dict: src/espeak-ng phsource/phonemes.stamp dictsource/sq_list dictsource/sq_rules dictsource/sq_extra +espeak-ng-data/sq_dict: src/espeak-ng phsource/phonemes.stamp dictsource/sq_list dictsource/sq_rules dictsource/sq_extra cd dictsource && ESPEAK_DATA_PATH=$(PWD) LD_LIBRARY_PATH=../src:${LD_LIBRARY_PATH} ../src/espeak-ng --compile=sq && cd .. -sv: espeak-data/sv_dict +sv: espeak-ng-data/sv_dict dictsource/sv_extra: touch dictsource/sv_extra -espeak-data/sv_dict: src/espeak-ng phsource/phonemes.stamp dictsource/sv_list dictsource/sv_rules dictsource/sv_extra +espeak-ng-data/sv_dict: src/espeak-ng phsource/phonemes.stamp dictsource/sv_list dictsource/sv_rules dictsource/sv_extra cd dictsource && ESPEAK_DATA_PATH=$(PWD) LD_LIBRARY_PATH=../src:${LD_LIBRARY_PATH} ../src/espeak-ng --compile=sv && cd .. -sw: espeak-data/sw_dict +sw: espeak-ng-data/sw_dict dictsource/sw_extra: touch dictsource/sw_extra -espeak-data/sw_dict: src/espeak-ng phsource/phonemes.stamp dictsource/sw_list dictsource/sw_rules dictsource/sw_extra +espeak-ng-data/sw_dict: src/espeak-ng phsource/phonemes.stamp dictsource/sw_list dictsource/sw_rules dictsource/sw_extra cd dictsource && ESPEAK_DATA_PATH=$(PWD) LD_LIBRARY_PATH=../src:${LD_LIBRARY_PATH} ../src/espeak-ng --compile=sw && cd .. -ta: espeak-data/ta_dict +ta: espeak-ng-data/ta_dict dictsource/ta_extra: touch dictsource/ta_extra -espeak-data/ta_dict: src/espeak-ng phsource/phonemes.stamp dictsource/ta_list dictsource/ta_rules dictsource/ta_extra +espeak-ng-data/ta_dict: src/espeak-ng phsource/phonemes.stamp dictsource/ta_list dictsource/ta_rules dictsource/ta_extra cd dictsource && ESPEAK_DATA_PATH=$(PWD) LD_LIBRARY_PATH=../src:${LD_LIBRARY_PATH} ../src/espeak-ng --compile=ta && cd .. -te: espeak-data/te_dict +te: espeak-ng-data/te_dict dictsource/te_extra: touch dictsource/te_extra -espeak-data/te_dict: src/espeak-ng phsource/phonemes.stamp dictsource/te_list dictsource/te_rules dictsource/te_extra +espeak-ng-data/te_dict: src/espeak-ng phsource/phonemes.stamp dictsource/te_list dictsource/te_rules dictsource/te_extra cd dictsource && ESPEAK_DATA_PATH=$(PWD) LD_LIBRARY_PATH=../src:${LD_LIBRARY_PATH} ../src/espeak-ng --compile=te && cd .. -tn: espeak-data/tn_dict +tn: espeak-ng-data/tn_dict dictsource/tn_extra: touch dictsource/tn_extra -espeak-data/tn_dict: src/espeak-ng phsource/phonemes.stamp dictsource/tn_list dictsource/tn_rules dictsource/tn_extra +espeak-ng-data/tn_dict: src/espeak-ng phsource/phonemes.stamp dictsource/tn_list dictsource/tn_rules dictsource/tn_extra cd dictsource && ESPEAK_DATA_PATH=$(PWD) LD_LIBRARY_PATH=../src:${LD_LIBRARY_PATH} ../src/espeak-ng --compile=tn && cd .. -tr: espeak-data/tr_dict +tr: espeak-ng-data/tr_dict dictsource/tr_extra: touch dictsource/tr_extra -espeak-data/tr_dict: src/espeak-ng phsource/phonemes.stamp dictsource/tr_list dictsource/tr_rules dictsource/tr_extra +espeak-ng-data/tr_dict: src/espeak-ng phsource/phonemes.stamp dictsource/tr_list dictsource/tr_rules dictsource/tr_extra cd dictsource && ESPEAK_DATA_PATH=$(PWD) LD_LIBRARY_PATH=../src:${LD_LIBRARY_PATH} ../src/espeak-ng --compile=tr && cd .. -tt: espeak-data/tt_dict +tt: espeak-ng-data/tt_dict dictsource/tt_extra: touch dictsource/tt_extra -espeak-data/tt_dict: src/espeak-ng phsource/phonemes.stamp dictsource/tt_list dictsource/tt_rules dictsource/tt_extra +espeak-ng-data/tt_dict: src/espeak-ng phsource/phonemes.stamp dictsource/tt_list dictsource/tt_rules dictsource/tt_extra cd dictsource && ESPEAK_DATA_PATH=$(PWD) LD_LIBRARY_PATH=../src:${LD_LIBRARY_PATH} ../src/espeak-ng --compile=tt && cd .. -ur: espeak-data/ur_dict +ur: espeak-ng-data/ur_dict dictsource/ur_extra: touch dictsource/ur_extra -espeak-data/ur_dict: src/espeak-ng phsource/phonemes.stamp dictsource/ur_list dictsource/ur_rules dictsource/ur_extra +espeak-ng-data/ur_dict: src/espeak-ng phsource/phonemes.stamp dictsource/ur_list dictsource/ur_rules dictsource/ur_extra cd dictsource && ESPEAK_DATA_PATH=$(PWD) LD_LIBRARY_PATH=../src:${LD_LIBRARY_PATH} ../src/espeak-ng --compile=ur && cd .. -vi: espeak-data/vi_dict +vi: espeak-ng-data/vi_dict dictsource/vi_extra: touch dictsource/vi_extra -espeak-data/vi_dict: src/espeak-ng phsource/phonemes.stamp dictsource/vi_list dictsource/vi_rules dictsource/vi_extra +espeak-ng-data/vi_dict: src/espeak-ng phsource/phonemes.stamp dictsource/vi_list dictsource/vi_rules dictsource/vi_extra cd dictsource && ESPEAK_DATA_PATH=$(PWD) LD_LIBRARY_PATH=../src:${LD_LIBRARY_PATH} ../src/espeak-ng --compile=vi && cd .. -zh: espeak-data/zh_dict +zh: espeak-ng-data/zh_dict dictsource/zh_extra: touch dictsource/zh_extra dictsource/zh_listx: ln -svf extra/zh_listx dictsource/ if HAVE_ZH_EXTENDED_DICTIONARY -espeak-data/zh_dict: src/espeak-ng phsource/phonemes.stamp dictsource/zh_list dictsource/zh_rules dictsource/zh_extra dictsource/zh_listx +espeak-ng-data/zh_dict: src/espeak-ng phsource/phonemes.stamp dictsource/zh_list dictsource/zh_rules dictsource/zh_extra dictsource/zh_listx else -espeak-data/zh_dict: src/espeak-ng phsource/phonemes.stamp dictsource/zh_list dictsource/zh_rules dictsource/zh_extra +espeak-ng-data/zh_dict: src/espeak-ng phsource/phonemes.stamp dictsource/zh_list dictsource/zh_rules dictsource/zh_extra endif cd dictsource && ESPEAK_DATA_PATH=$(PWD) LD_LIBRARY_PATH=../src:${LD_LIBRARY_PATH} ../src/espeak-ng --compile=zh && cd .. -zhy: espeak-data/zhy_dict +zhy: espeak-ng-data/zhy_dict dictsource/zhy_extra: touch dictsource/zhy_extra dictsource/zhy_list: ln -svf extra/zhy_list dictsource/ if HAVE_ZHY_EXTENDED_DICTIONARY -espeak-data/zhy_dict: src/espeak-ng phsource/phonemes.stamp dictsource/zhy_rules dictsource/zhy_extra dictsource/zhy_list +espeak-ng-data/zhy_dict: src/espeak-ng phsource/phonemes.stamp dictsource/zhy_rules dictsource/zhy_extra dictsource/zhy_list else -espeak-data/zhy_dict: src/espeak-ng phsource/phonemes.stamp dictsource/zhy_rules dictsource/zhy_extra +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 .. ##### mbrola: mbrola: \ - espeak-data/mbrola_ph/af1_phtrans \ - espeak-data/mbrola_ph/cr1_phtrans \ - espeak-data/mbrola_ph/cs_phtrans \ - espeak-data/mbrola_ph/de2_phtrans \ - espeak-data/mbrola_ph/de4_phtrans \ - espeak-data/mbrola_ph/de6_phtrans \ - espeak-data/mbrola_ph/ee1_phtrans \ - espeak-data/mbrola_ph/en1_phtrans \ - espeak-data/mbrola_ph/es_phtrans \ - espeak-data/mbrola_ph/fr1_phtrans \ - espeak-data/mbrola_ph/gr2_phtrans \ - espeak-data/mbrola_ph/grc-de6_phtrans \ - espeak-data/mbrola_ph/hn1_phtrans \ - espeak-data/mbrola_ph/hu1_phtrans \ - espeak-data/mbrola_ph/ic1_phtrans \ - espeak-data/mbrola_ph/id1_phtrans \ - espeak-data/mbrola_ph/in1_phtrans \ - espeak-data/mbrola_ph/ir1_phtrans \ - espeak-data/mbrola_ph/it3_phtrans \ - espeak-data/mbrola_ph/la1_phtrans \ - espeak-data/mbrola_ph/lt1_phtrans \ - espeak-data/mbrola_ph/lt2_phtrans \ - espeak-data/mbrola_ph/mx1_phtrans \ - espeak-data/mbrola_ph/mx2_phtrans \ - espeak-data/mbrola_ph/nl_phtrans \ - espeak-data/mbrola_ph/pl1_phtrans \ - espeak-data/mbrola_ph/pt1_phtrans \ - espeak-data/mbrola_ph/ptbr_phtrans \ - espeak-data/mbrola_ph/ptbr4_phtrans \ - espeak-data/mbrola_ph/ro1_phtrans \ - espeak-data/mbrola_ph/sv_phtrans \ - espeak-data/mbrola_ph/sv2_phtrans \ - espeak-data/mbrola_ph/tr1_phtrans \ - espeak-data/mbrola_ph/us_phtrans \ - espeak-data/mbrola_ph/us3_phtrans \ - espeak-data/mbrola_ph/vz_phtrans + espeak-ng-data/mbrola_ph/af1_phtrans \ + espeak-ng-data/mbrola_ph/cr1_phtrans \ + espeak-ng-data/mbrola_ph/cs_phtrans \ + espeak-ng-data/mbrola_ph/de2_phtrans \ + espeak-ng-data/mbrola_ph/de4_phtrans \ + espeak-ng-data/mbrola_ph/de6_phtrans \ + espeak-ng-data/mbrola_ph/ee1_phtrans \ + espeak-ng-data/mbrola_ph/en1_phtrans \ + espeak-ng-data/mbrola_ph/es_phtrans \ + espeak-ng-data/mbrola_ph/fr1_phtrans \ + espeak-ng-data/mbrola_ph/gr2_phtrans \ + espeak-ng-data/mbrola_ph/grc-de6_phtrans \ + espeak-ng-data/mbrola_ph/hn1_phtrans \ + espeak-ng-data/mbrola_ph/hu1_phtrans \ + espeak-ng-data/mbrola_ph/ic1_phtrans \ + espeak-ng-data/mbrola_ph/id1_phtrans \ + espeak-ng-data/mbrola_ph/in1_phtrans \ + espeak-ng-data/mbrola_ph/ir1_phtrans \ + espeak-ng-data/mbrola_ph/it3_phtrans \ + espeak-ng-data/mbrola_ph/la1_phtrans \ + espeak-ng-data/mbrola_ph/lt1_phtrans \ + espeak-ng-data/mbrola_ph/lt2_phtrans \ + espeak-ng-data/mbrola_ph/mx1_phtrans \ + espeak-ng-data/mbrola_ph/mx2_phtrans \ + espeak-ng-data/mbrola_ph/nl_phtrans \ + espeak-ng-data/mbrola_ph/pl1_phtrans \ + espeak-ng-data/mbrola_ph/pt1_phtrans \ + espeak-ng-data/mbrola_ph/ptbr_phtrans \ + espeak-ng-data/mbrola_ph/ptbr4_phtrans \ + espeak-ng-data/mbrola_ph/ro1_phtrans \ + espeak-ng-data/mbrola_ph/sv_phtrans \ + espeak-ng-data/mbrola_ph/sv2_phtrans \ + espeak-ng-data/mbrola_ph/tr1_phtrans \ + espeak-ng-data/mbrola_ph/us_phtrans \ + espeak-ng-data/mbrola_ph/us3_phtrans \ + espeak-ng-data/mbrola_ph/vz_phtrans -espeak-data/mbrola_ph/af1_phtrans: phsource/mbrola/af1 src/espeak-ng - mkdir -p espeak-data/mbrola_ph +espeak-ng-data/mbrola_ph/af1_phtrans: phsource/mbrola/af1 src/espeak-ng + mkdir -p espeak-ng-data/mbrola_ph ESPEAK_DATA_PATH=$(PWD) src/espeak-ng --compile-mbrola=phsource/mbrola/af1 -espeak-data/mbrola_ph/cr1_phtrans: phsource/mbrola/cr1 src/espeak-ng - mkdir -p espeak-data/mbrola_ph +espeak-ng-data/mbrola_ph/cr1_phtrans: phsource/mbrola/cr1 src/espeak-ng + mkdir -p espeak-ng-data/mbrola_ph ESPEAK_DATA_PATH=$(PWD) src/espeak-ng --compile-mbrola=phsource/mbrola/cr1 -espeak-data/mbrola_ph/cs_phtrans: phsource/mbrola/cs src/espeak-ng - mkdir -p espeak-data/mbrola_ph +espeak-ng-data/mbrola_ph/cs_phtrans: phsource/mbrola/cs src/espeak-ng + mkdir -p espeak-ng-data/mbrola_ph ESPEAK_DATA_PATH=$(PWD) src/espeak-ng --compile-mbrola=phsource/mbrola/cs -espeak-data/mbrola_ph/de2_phtrans: phsource/mbrola/de2 src/espeak-ng - mkdir -p espeak-data/mbrola_ph +espeak-ng-data/mbrola_ph/de2_phtrans: phsource/mbrola/de2 src/espeak-ng + mkdir -p espeak-ng-data/mbrola_ph ESPEAK_DATA_PATH=$(PWD) src/espeak-ng --compile-mbrola=phsource/mbrola/de2 -espeak-data/mbrola_ph/de4_phtrans: phsource/mbrola/de4 src/espeak-ng - mkdir -p espeak-data/mbrola_ph +espeak-ng-data/mbrola_ph/de4_phtrans: phsource/mbrola/de4 src/espeak-ng + mkdir -p espeak-ng-data/mbrola_ph ESPEAK_DATA_PATH=$(PWD) src/espeak-ng --compile-mbrola=phsource/mbrola/de4 -espeak-data/mbrola_ph/de6_phtrans: phsource/mbrola/de6 src/espeak-ng - mkdir -p espeak-data/mbrola_ph +espeak-ng-data/mbrola_ph/de6_phtrans: phsource/mbrola/de6 src/espeak-ng + mkdir -p espeak-ng-data/mbrola_ph ESPEAK_DATA_PATH=$(PWD) src/espeak-ng --compile-mbrola=phsource/mbrola/de6 -espeak-data/mbrola_ph/ee1_phtrans: phsource/mbrola/ee1 src/espeak-ng - mkdir -p espeak-data/mbrola_ph +espeak-ng-data/mbrola_ph/ee1_phtrans: phsource/mbrola/ee1 src/espeak-ng + mkdir -p espeak-ng-data/mbrola_ph ESPEAK_DATA_PATH=$(PWD) src/espeak-ng --compile-mbrola=phsource/mbrola/ee1 -espeak-data/mbrola_ph/en1_phtrans: phsource/mbrola/en1 src/espeak-ng - mkdir -p espeak-data/mbrola_ph +espeak-ng-data/mbrola_ph/en1_phtrans: phsource/mbrola/en1 src/espeak-ng + mkdir -p espeak-ng-data/mbrola_ph ESPEAK_DATA_PATH=$(PWD) src/espeak-ng --compile-mbrola=phsource/mbrola/en1 -espeak-data/mbrola_ph/es_phtrans: phsource/mbrola/es src/espeak-ng - mkdir -p espeak-data/mbrola_ph +espeak-ng-data/mbrola_ph/es_phtrans: phsource/mbrola/es src/espeak-ng + mkdir -p espeak-ng-data/mbrola_ph ESPEAK_DATA_PATH=$(PWD) src/espeak-ng --compile-mbrola=phsource/mbrola/es -espeak-data/mbrola_ph/fr1_phtrans: phsource/mbrola/fr1 src/espeak-ng - mkdir -p espeak-data/mbrola_ph +espeak-ng-data/mbrola_ph/fr1_phtrans: phsource/mbrola/fr1 src/espeak-ng + mkdir -p espeak-ng-data/mbrola_ph ESPEAK_DATA_PATH=$(PWD) src/espeak-ng --compile-mbrola=phsource/mbrola/fr1 -espeak-data/mbrola_ph/gr2_phtrans: phsource/mbrola/gr2 src/espeak-ng - mkdir -p espeak-data/mbrola_ph +espeak-ng-data/mbrola_ph/gr2_phtrans: phsource/mbrola/gr2 src/espeak-ng + mkdir -p espeak-ng-data/mbrola_ph ESPEAK_DATA_PATH=$(PWD) src/espeak-ng --compile-mbrola=phsource/mbrola/gr2 -espeak-data/mbrola_ph/grc-de6_phtrans: phsource/mbrola/grc-de6 src/espeak-ng - mkdir -p espeak-data/mbrola_ph +espeak-ng-data/mbrola_ph/grc-de6_phtrans: phsource/mbrola/grc-de6 src/espeak-ng + mkdir -p espeak-ng-data/mbrola_ph ESPEAK_DATA_PATH=$(PWD) src/espeak-ng --compile-mbrola=phsource/mbrola/grc-de6 -espeak-data/mbrola_ph/hn1_phtrans: phsource/mbrola/hn1 src/espeak-ng - mkdir -p espeak-data/mbrola_ph +espeak-ng-data/mbrola_ph/hn1_phtrans: phsource/mbrola/hn1 src/espeak-ng + mkdir -p espeak-ng-data/mbrola_ph ESPEAK_DATA_PATH=$(PWD) src/espeak-ng --compile-mbrola=phsource/mbrola/hn1 -espeak-data/mbrola_ph/hu1_phtrans: phsource/mbrola/hu1 src/espeak-ng - mkdir -p espeak-data/mbrola_ph +espeak-ng-data/mbrola_ph/hu1_phtrans: phsource/mbrola/hu1 src/espeak-ng + mkdir -p espeak-ng-data/mbrola_ph ESPEAK_DATA_PATH=$(PWD) src/espeak-ng --compile-mbrola=phsource/mbrola/hu1 -espeak-data/mbrola_ph/ic1_phtrans: phsource/mbrola/ic1 src/espeak-ng - mkdir -p espeak-data/mbrola_ph +espeak-ng-data/mbrola_ph/ic1_phtrans: phsource/mbrola/ic1 src/espeak-ng + mkdir -p espeak-ng-data/mbrola_ph ESPEAK_DATA_PATH=$(PWD) src/espeak-ng --compile-mbrola=phsource/mbrola/ic1 -espeak-data/mbrola_ph/id1_phtrans: phsource/mbrola/id1 src/espeak-ng - mkdir -p espeak-data/mbrola_ph +espeak-ng-data/mbrola_ph/id1_phtrans: phsource/mbrola/id1 src/espeak-ng + mkdir -p espeak-ng-data/mbrola_ph ESPEAK_DATA_PATH=$(PWD) src/espeak-ng --compile-mbrola=phsource/mbrola/id1 -espeak-data/mbrola_ph/in1_phtrans: phsource/mbrola/in1 src/espeak-ng - mkdir -p espeak-data/mbrola_ph +espeak-ng-data/mbrola_ph/in1_phtrans: phsource/mbrola/in1 src/espeak-ng + mkdir -p espeak-ng-data/mbrola_ph ESPEAK_DATA_PATH=$(PWD) src/espeak-ng --compile-mbrola=phsource/mbrola/in1 -espeak-data/mbrola_ph/ir1_phtrans: phsource/mbrola/ir1 src/espeak-ng - mkdir -p espeak-data/mbrola_ph +espeak-ng-data/mbrola_ph/ir1_phtrans: phsource/mbrola/ir1 src/espeak-ng + mkdir -p espeak-ng-data/mbrola_ph ESPEAK_DATA_PATH=$(PWD) src/espeak-ng --compile-mbrola=phsource/mbrola/ir1 -espeak-data/mbrola_ph/it3_phtrans: phsource/mbrola/it3 src/espeak-ng - mkdir -p espeak-data/mbrola_ph +espeak-ng-data/mbrola_ph/it3_phtrans: phsource/mbrola/it3 src/espeak-ng + mkdir -p espeak-ng-data/mbrola_ph ESPEAK_DATA_PATH=$(PWD) src/espeak-ng --compile-mbrola=phsource/mbrola/it3 -espeak-data/mbrola_ph/la1_phtrans: phsource/mbrola/la1 src/espeak-ng - mkdir -p espeak-data/mbrola_ph +espeak-ng-data/mbrola_ph/la1_phtrans: phsource/mbrola/la1 src/espeak-ng + mkdir -p espeak-ng-data/mbrola_ph ESPEAK_DATA_PATH=$(PWD) src/espeak-ng --compile-mbrola=phsource/mbrola/la1 -espeak-data/mbrola_ph/lt1_phtrans: phsource/mbrola/lt1 src/espeak-ng - mkdir -p espeak-data/mbrola_ph +espeak-ng-data/mbrola_ph/lt1_phtrans: phsource/mbrola/lt1 src/espeak-ng + mkdir -p espeak-ng-data/mbrola_ph ESPEAK_DATA_PATH=$(PWD) src/espeak-ng --compile-mbrola=phsource/mbrola/lt1 -espeak-data/mbrola_ph/lt2_phtrans: phsource/mbrola/lt2 src/espeak-ng - mkdir -p espeak-data/mbrola_ph +espeak-ng-data/mbrola_ph/lt2_phtrans: phsource/mbrola/lt2 src/espeak-ng + mkdir -p espeak-ng-data/mbrola_ph ESPEAK_DATA_PATH=$(PWD) src/espeak-ng --compile-mbrola=phsource/mbrola/lt2 -espeak-data/mbrola_ph/mx1_phtrans: phsource/mbrola/mx1 src/espeak-ng - mkdir -p espeak-data/mbrola_ph +espeak-ng-data/mbrola_ph/mx1_phtrans: phsource/mbrola/mx1 src/espeak-ng + mkdir -p espeak-ng-data/mbrola_ph ESPEAK_DATA_PATH=$(PWD) src/espeak-ng --compile-mbrola=phsource/mbrola/mx1 -espeak-data/mbrola_ph/mx2_phtrans: phsource/mbrola/mx2 src/espeak-ng - mkdir -p espeak-data/mbrola_ph +espeak-ng-data/mbrola_ph/mx2_phtrans: phsource/mbrola/mx2 src/espeak-ng + mkdir -p espeak-ng-data/mbrola_ph ESPEAK_DATA_PATH=$(PWD) src/espeak-ng --compile-mbrola=phsource/mbrola/mx2 -espeak-data/mbrola_ph/nl_phtrans: phsource/mbrola/nl src/espeak-ng - mkdir -p espeak-data/mbrola_ph +espeak-ng-data/mbrola_ph/nl_phtrans: phsource/mbrola/nl src/espeak-ng + mkdir -p espeak-ng-data/mbrola_ph ESPEAK_DATA_PATH=$(PWD) src/espeak-ng --compile-mbrola=phsource/mbrola/nl -espeak-data/mbrola_ph/pl1_phtrans: phsource/mbrola/pl1 src/espeak-ng - mkdir -p espeak-data/mbrola_ph +espeak-ng-data/mbrola_ph/pl1_phtrans: phsource/mbrola/pl1 src/espeak-ng + mkdir -p espeak-ng-data/mbrola_ph ESPEAK_DATA_PATH=$(PWD) src/espeak-ng --compile-mbrola=phsource/mbrola/pl1 -espeak-data/mbrola_ph/pt1_phtrans: phsource/mbrola/pt1 src/espeak-ng - mkdir -p espeak-data/mbrola_ph +espeak-ng-data/mbrola_ph/pt1_phtrans: phsource/mbrola/pt1 src/espeak-ng + mkdir -p espeak-ng-data/mbrola_ph ESPEAK_DATA_PATH=$(PWD) src/espeak-ng --compile-mbrola=phsource/mbrola/pt1 -espeak-data/mbrola_ph/ptbr_phtrans: phsource/mbrola/ptbr src/espeak-ng - mkdir -p espeak-data/mbrola_ph +espeak-ng-data/mbrola_ph/ptbr_phtrans: phsource/mbrola/ptbr src/espeak-ng + mkdir -p espeak-ng-data/mbrola_ph ESPEAK_DATA_PATH=$(PWD) src/espeak-ng --compile-mbrola=phsource/mbrola/ptbr -espeak-data/mbrola_ph/ptbr4_phtrans: phsource/mbrola/ptbr4 src/espeak-ng - mkdir -p espeak-data/mbrola_ph +espeak-ng-data/mbrola_ph/ptbr4_phtrans: phsource/mbrola/ptbr4 src/espeak-ng + mkdir -p espeak-ng-data/mbrola_ph ESPEAK_DATA_PATH=$(PWD) src/espeak-ng --compile-mbrola=phsource/mbrola/ptbr4 -espeak-data/mbrola_ph/ro1_phtrans: phsource/mbrola/ro1 src/espeak-ng - mkdir -p espeak-data/mbrola_ph +espeak-ng-data/mbrola_ph/ro1_phtrans: phsource/mbrola/ro1 src/espeak-ng + mkdir -p espeak-ng-data/mbrola_ph ESPEAK_DATA_PATH=$(PWD) src/espeak-ng --compile-mbrola=phsource/mbrola/ro1 -espeak-data/mbrola_ph/sv_phtrans: phsource/mbrola/sv src/espeak-ng - mkdir -p espeak-data/mbrola_ph +espeak-ng-data/mbrola_ph/sv_phtrans: phsource/mbrola/sv src/espeak-ng + mkdir -p espeak-ng-data/mbrola_ph ESPEAK_DATA_PATH=$(PWD) src/espeak-ng --compile-mbrola=phsource/mbrola/sv -espeak-data/mbrola_ph/sv2_phtrans: phsource/mbrola/sv2 src/espeak-ng - mkdir -p espeak-data/mbrola_ph +espeak-ng-data/mbrola_ph/sv2_phtrans: phsource/mbrola/sv2 src/espeak-ng + mkdir -p espeak-ng-data/mbrola_ph ESPEAK_DATA_PATH=$(PWD) src/espeak-ng --compile-mbrola=phsource/mbrola/sv2 -espeak-data/mbrola_ph/tr1_phtrans: phsource/mbrola/tr1 src/espeak-ng - mkdir -p espeak-data/mbrola_ph +espeak-ng-data/mbrola_ph/tr1_phtrans: phsource/mbrola/tr1 src/espeak-ng + mkdir -p espeak-ng-data/mbrola_ph ESPEAK_DATA_PATH=$(PWD) src/espeak-ng --compile-mbrola=phsource/mbrola/tr1 -espeak-data/mbrola_ph/us_phtrans: phsource/mbrola/us src/espeak-ng - mkdir -p espeak-data/mbrola_ph +espeak-ng-data/mbrola_ph/us_phtrans: phsource/mbrola/us src/espeak-ng + mkdir -p espeak-ng-data/mbrola_ph ESPEAK_DATA_PATH=$(PWD) src/espeak-ng --compile-mbrola=phsource/mbrola/us -espeak-data/mbrola_ph/us3_phtrans: phsource/mbrola/us3 src/espeak-ng - mkdir -p espeak-data/mbrola_ph +espeak-ng-data/mbrola_ph/us3_phtrans: phsource/mbrola/us3 src/espeak-ng + mkdir -p espeak-ng-data/mbrola_ph ESPEAK_DATA_PATH=$(PWD) src/espeak-ng --compile-mbrola=phsource/mbrola/us3 -espeak-data/mbrola_ph/vz_phtrans: phsource/mbrola/vz src/espeak-ng - mkdir -p espeak-data/mbrola_ph +espeak-ng-data/mbrola_ph/vz_phtrans: phsource/mbrola/vz src/espeak-ng + mkdir -p espeak-ng-data/mbrola_ph ESPEAK_DATA_PATH=$(PWD) src/espeak-ng --compile-mbrola=phsource/mbrola/vz diff --git a/README.md b/README.md index 7e3049c4..9239b40a 100644 --- a/README.md +++ b/README.md @@ -183,7 +183,7 @@ from the top-level directory of this project: The `ESPEAK_DATA_PATH` variable needs to be set to use the espeak-ng data from the source tree. Otherwise, espeak-ng will look in `$(HOME)` or -`/usr/share/espeak-data`. +`/usr/share/espeak-ng-data`. The `LD_LIBRARY_PATH` is set as `espeak` uses the `libespeak-ng.so` shared library. This ensures that `espeak` uses the built shared library in the @@ -234,7 +234,7 @@ a few caveats. More specifically: `ESPEAK_API` macro when building on Windows. All new APIs are being added to `espeak-ng/espeak_ng.h`. -4. The _espeak-data_ files have been modified slightly. Currently _espeak-ng_ +4. The _espeak-ng-data_ files have been modified slightly. Currently _espeak-ng_ can read _espeak_ data, but _espeak_ cannot read _espeak-ng_ data, because _espeak-ng_ uses a different voice data so that both _espeak_ and _espeak-ng_ can be installed on the same machine without problems. diff --git a/configure.ac b/configure.ac index 85b0ee6b..9fc5fed7 100644 --- a/configure.ac +++ b/configure.ac @@ -1,5 +1,5 @@ AC_PREREQ([2.63]) -AC_INIT([eSpeak NG], [1.48.15], [https://github.com/espeak-ng/espeak-ng/issues], [espeak-ng], [https://github.com/espeak-ng/espeak-ng]) +AC_INIT([eSpeak NG], [1.49.0], [https://github.com/espeak-ng/espeak-ng/issues], [espeak-ng], [https://github.com/espeak-ng/espeak-ng]) AM_INIT_AUTOMAKE() LT_INIT diff --git a/dictsource/it_list b/dictsource/it_list index 6779fc21..2fef8dc8 100644 --- a/dictsource/it_list +++ b/dictsource/it_list @@ -1,6 +1,6 @@  // This file is UTF-8 encoded -// Updated 2016 july 8 by Christian Leo M, +// Updated 2016 September 8 by Christian Leo M, // $alt change [e] or [o] in the stressed syllable to [E] or [O] // $alt2 change [E] or [O] in the stressed syllable to [e] or [o] @@ -47,6 +47,7 @@ _ò $accent _ù $accent _ú $accent ñ $accent +ć $accent // accent names @@ -95,7 +96,7 @@ _( ap,E@-*ta||paR'entezi _) kj,uza||paR'entezi _[ ap'ERtakw2'ad@-*a _] kj,uzakw2'ad@-*a -_{ ap,eRtag@-*'af:a +_{ ap,ERtag@-*'af:a _} kj,uzag@-*'af:a _< min'oRe||d'I _> madZ:'oRe||d'I @@ -140,10 +141,12 @@ _‐ legat'u:Ra _‒ lini'et:a _‑ t@-*at:,ino||duni'one ə Swa/: -ɛ 'E||ap'e@-*ta -ɔ 'O||ap'e@-*ta +ɛ 'E||ap'E@-*ta +ɔ 'O||ap'E@-*ta ɾ ER*e||untSin'ata ʔ glotalst'Op +ɡ dZ'i||vel'aRe||ok:luz'iva // U+0261 +ɣ g'am:a||min'uskola // U+0263 voiced velar fricative _‣ punt'ato ◦ punt'ato @@ -542,7 +545,7 @@ perché $u+ $brk pure $u+ più $u+ se $u+ $verbf -senza s,E:nts2a +senza s,Ents2a senza s'Entsa $atend si si: $atend sopra $alt2 @@ -832,8 +835,10 @@ doppler $1 down d'a/:w2n download d'a/:w2nl,o:d drive _^_EN -driver _^_EN +driver d@-*'a|Ive@-* +dropbox d@-*'Op||b,O:ks ebook 'i:b,Uk +(e book) i||b'U:k edition ed'iSon $onlys editor 'Edito@-* $onlys l'editor l'Edito@-* $only @@ -908,6 +913,7 @@ hotel $2 hunter 'ha/nte@-* $onlys hunt _^_en $only iceberg 'aIs||b,e@-*g +imam $2 impeachment imp'itSm,ent[ information info@-*m'ES@n $onlys installer inst'a:l:e@-* @@ -979,6 +985,7 @@ mister $1 $onlys mixer $1 monitor $1 $onlys monsieur _^_FR +moquette mok'et[ motor $1 $alt $onlys mountanbike montanb'aIk mouse maus @@ -1038,6 +1045,7 @@ raider $1 ranger @-*'endZe@-* richter $1 $only reader @-*'i:dE@-* +reject @-*IdZ'ekt[ rapper @-*'Epp@@-* $onlys recorder $2 $onlys reporter $2 $onlys @@ -1208,7 +1216,6 @@ antidolorifici $5 antilopi $2 antipatie antipat'ie apatie apat'ie -apert $alt2 aprile ap@-*'ilE apriscatol $3 arbore $1 @@ -1296,7 +1303,7 @@ dei d'E:i $noun deleghe $1 dentifrici $3 deroghe $1 -desideri d,ezid'E:RI $only +desideri d,Ezid'E:RI $only desossicortisol $6 detraibil det@-*a'ibil diamin di'amin @@ -1660,7 +1667,7 @@ vent'anni vent'an:I (principi attivi) p@-*intS'i:pI||at:'ivI (principi morali) p@-*intS'i:pI||moR'alI (principi sociali) p@-*intS'i:pI||sotS'alI -(ciao ciao) tS,a/o||tS'a:o +(ciao ciao) tS,a:o||tS'a:o (un turbine) un||_t'u@-*bine (gli auguri) l^iaw2g'u:RI (pro capite) p@-*ok'a:pIte @@ -1899,7 +1906,7 @@ malcesine $2 $alt2 malesia $2 $alt manchester _^_EN manciano $2 -mandragola $2 +mandragol $2 mantova $1 marsciano $2 materano $3 @@ -1911,7 +1918,7 @@ melizzano $3 mesopotamia $4 mexic $alt2 mezzano medz:'ano -miami maj'EmI +miami maj'EmI $only minneapolis $3 minucciano $3 miscano $2 @@ -2378,6 +2385,7 @@ mazzin $2 mazzol $2 meola $1 mercury $1 $alt2 $only +michel mik'e/l michael m'aIkOl michelangel $3 michelle m,iS'el $only @@ -2452,9 +2460,11 @@ schopenhauer S,Open'a:w2e@-* schumann S'u:man schumacher _^_DE Schubert S'ube@-*t +schwarzenegger Sv,a:rz@n'Eger schwarznegger Sv,arzn'Eger sean _^_EN $only $capital shakespeare _^_EN +sharazad $3 shaun S'O:n $only simon s'aImon $onlys socrate $1 @@ -2579,6 +2589,7 @@ acchiappino $2 acciecano $2 acclamano $2 acclamino $2 +accreditano $2 accodano $2 accodino $2 accomoda $2 @@ -2654,6 +2665,7 @@ agite $2 agitino $1 agito adZ'i:to $verb aiutano aj'utano +aiutino $2 $verb alimentino $3 allaccino $2 allaghino $2 @@ -2822,6 +2834,7 @@ bastino $1 bastono $2 battezzat bat:edz:'at battezzino bat:'edz:ino +beccano $1 bendano $1 bendino $1 benedic $3 @@ -2914,9 +2927,11 @@ comincino $2 commemor $2 $alt commutino $2 compaiano $2 -competano $2 +competano $2 $alt +compiace kompj'atSe/ compiacere $3 -compiere k'o:mpjeRe +compiaci kompj'atSi +compiere k'ompjeRe compilano $2 completano $2 comprano $1 @@ -3974,7 +3989,7 @@ rigirano $2 riguadagnano $3 riguardano $2 riguardino $2 -rigurgita $2 +rigurgit $2 rilascino $2 rimacinano $2 rimandano $2 @@ -4578,13 +4593,13 @@ zuccherano $1 (perdono tempo) p'E:@-*dono||t'Empo (come desideri) kome||dez'ideRi (così desideri) koz'i||_dez'i:deRI -(cosa desideri) k'O:za||dez'i:deRI +(cosa desideri) k'Oza||dez'i:deRI (cui desideri) k'u:|I||dez'ide**I (invece desideri) inv'etSe||dez'ide**I (la desideri) ladez'i:deRi (lo desideri) lodez'ideRi (mi desideri) mI||dez'i:deRI -// (non desideri) non||dez'ideRI +(desideri che) dez'ideRi||k'e (quando desideri) kwando||_|dez'i:deRi (quindi desideri) kw,indi||_dez'i:deRi @@ -4609,6 +4624,7 @@ arrivatoci $3 ascoltaci $2 ascoltami $2 ascoltal $2 +ascoltati ask'OltatI $atstart aspettami $2 $alt assecondal $3 assumersi $2 @@ -4620,8 +4636,6 @@ carical $1 causatoci $3 cercal $1 cercasi $1 -chiediti $1 -chiuditi kj'uditI cliccal $1 cliccaci $1 compiersi $1 @@ -4673,14 +4687,13 @@ guardagliel $1 guardal $1 guardamel $1 guardami $1 -guardati $1 +guardati $1 $atstart guardaci $1 guidaci $1 illuminaci $2 illuminami $2 illuminal $2 immergiti $2 -immetterl $2 impostaci $2 impostomi $2 indirizziamoci indiRi_tsj'amotSI // $5 @@ -4747,6 +4760,7 @@ rincorrerl $2 risparmial $2 risparmiaci $2 risparmiami $2 +rivelaci $2 rivelataci $3 rizzarsi @-*its2:'a@-*sI sbrigati $1 @@ -4771,7 +4785,8 @@ stabilitosi $3 stampal $1 suggeritomi $3 svegliati $1 $atstart -svoltasi $1 $alt $atstart +svelaci $1 +svoltasi $1 $alt svoltesi $1 svoltosi $1 $alt svuotal $2 $alt2 @@ -4779,6 +4794,7 @@ tenutasi $2 tenutosi $2 tenutisi $2 tornaci $1 +tornatene $1 trattasi $1 tuffati $1 $atstart usal 'u:za/l @@ -4794,6 +4810,7 @@ volevasi $2 accender $2 batter $1 +chieder $1 $alt commetter $2 comprender $2 dipender $2 @@ -4819,4 +4836,3 @@ tender $1 tener $2 $alt2 $only - diff --git a/dictsource/it_listx b/dictsource/it_listx index a178da6c..95152812 100644 --- a/dictsource/it_listx +++ b/dictsource/it_listx @@ -12,6 +12,7 @@ abiotrofia $5 abit $1 abomas $2 abulie $3 +academia akad'Emja/ acantodi $3 $alt acar $1 acari $1 @@ -77,7 +78,6 @@ aerovia $4 affett $alt affori $1 afonie afon'i;e -afragol $alt2 agadez $3 agapit $2 agave $1 @@ -108,11 +108,10 @@ alcam $1 alcantar $2 alchil alk'il alchimia $2 -alcool $1 +alcool 'alkO:l alcoolici alk'o:litSI alcoolico alk'o:liko alcor $2 -alcov $alt aldebaran $4 alea $1 alen $alt2 @@ -126,9 +125,8 @@ algebric $alt algenib $alt algovia $alt alibi 'alibI -alimen $alt2 aliquot $2 -alit $1 +alit $1 allegorie $4 allegria $3 allegrie $3 @@ -213,11 +211,9 @@ angol $1 angor $1 angoscia ang'OSa angustie $2 -anicet $alt anidr $1 anidrid anid@-*'Id aniridia $4 -anisotteri $alt anit $1 annid $2 anoa $alt @@ -230,22 +226,18 @@ ansia 'ansia ansie 'ansie antelao $3 antemi $alt -antenn $alt2 -antenne $alt2 +antenn $alt2 anter $1 antera $2 -anteros $1 -anthemis $1 antiaerea $3 antiaeree $3 antiaerei $3 antiaereo $3 -antic $2 +antic $2 anticamer $3 anticip $2 -anticresi $alt antidot $2 -antidrog $alt +antidrog $alt antieroe $alt antif $1 antifate $2 @@ -257,7 +249,7 @@ antigrandine $3 antiloc $2 antilope $2 antimafia $3 -antimateria $4 +antimateria $4 antimaterie $4 antincendi $alt antinoe $2 @@ -272,7 +264,6 @@ antonomasia $4 antropofag $3 antroposofia $5 anuak $3 -aot $alt apocatastasi $4 apocope $2 apocrif $2 @@ -294,7 +285,6 @@ aprassia $3 aprassie ap@-*ass'i;e apricen $alt2 aquilegia $3 $alt -aragost $alt2 arancine $3 arbitr $1 arboreo $2 @@ -328,11 +318,11 @@ argan $1 argentea $2 $alt argentee $2 argentei $2 $alt -argenteo $2 $alt +argenteo $2 $alt argostoli $3 argovia $alt ariete $alt -arist $1 +arist $1 aristagor $3 aristogitone $4 aristossen $3 @@ -344,8 +334,7 @@ arosi $alt arpia $2 arpie a@-*p'i:e arpocrate $2 -arred $alt -arroscia $alt +arred $alt artemi $alt artemisia $3 artemisie $3 @@ -354,13 +343,10 @@ arterie $2 arteriol $3 ascalaf $2 ascari $1 -ascension $4 $alt2 ascesi aS'EzI ascet $alt asciugacapelli $alt2 -asclepi $alt asclepiodot $4 -asepsi $alt asfissia $3 asil $2 asin $1 @@ -385,26 +371,22 @@ astenia $3 astenie asten'i:e asteria $2 astragal $2 -asuncion $3 $alt2 atalia $3 atarassia $4 atargatis $2 atassia $3 atei $1 atele $1 -atelet $alt -atenolf $alt ateo $1 -atlet $alt -atom $1 -aton $1 +atlet $alt +atom $1 +aton $1 atrii $1 atrofia $3 atrofie at@-*of'i:e -attendol $alt attimis $1 attizzare at:i_ts'aRe -attorn $alt2 +attorn $alt2 augure $1 augusteo $3 aulos $3 @@ -434,7 +416,6 @@ autostop $4 $alt avampost $alt2 avaria $3 aven $alt2 -avvi $2 ayame $3 ayatollah $4 azaria $3 @@ -444,7 +425,7 @@ azimut $1 azoospermia $5 azot $alt aztec $alt -aztechi adz_t'E:kI +aztechi adz_t'EkI bacen $alt2 bachec $alt bacil $2 @@ -458,12 +439,11 @@ bajazet $3 $alt2 baka $2 balaam $1 balaustr $3 -balen $alt2 -balenotter $alt +balen $alt2 +balenotter $alt bali $2 balneo $1 balsam $1 -balsami $1 banari $1 bancarott $alt2 banconot $alt @@ -506,7 +486,7 @@ becc $alt2 beg $alt belial $3 belloves $alt -belv $alt2 +belv $alt2 belvedere $3 $alt2 belzebù beldz,Eb'u bemb $alt @@ -518,7 +498,6 @@ benzil bendz'il benzin bendz'In beot $alt berber $1 -berberi $1 bere $alt2 bergeggi $alt2 bergere $2 @@ -534,8 +513,7 @@ beton $2 $alt bezzi b'E_tsI biathlon $1 biberon $3 -bibit $1 -bibite $1 +bibit $1 bibliotec $alt bienni $alt bientin $1 $alt @@ -562,7 +540,6 @@ bisturi $1 bizantin bidzant'in blasfem $alt blastopor $2 -blevi $alt boa $alt boabdil $3 bob $alt @@ -572,7 +549,6 @@ boccaner $alt2 boccett $alt2 boccia $alt boem $alt -boheme $alt bol $alt bolgheri $1 bolgia $1 $alt @@ -594,21 +570,17 @@ borg $alt2 borghi $alt2 borgia $1 borgorose $alt -borgosatoll $alt2 borgosesia $3 $alt born $alt2 borneo $1 borraccine $3 -borro $alt2 -bors $alt2 -bos $alt -bosc $alt -bosconer $alt2 +borro $alt2 +bors $alt2 +bos $alt +bosc $alt bosfor $1 $alt -bosi $alt botol $1 -bouleuterion $alt2 -bov $alt +bov $alt bovegn $1 $alt boves $alt bozzol $alt @@ -664,7 +636,6 @@ buscemi $alt butanol $3 cabal $1 cabinovia $4 -cacao $2 cacasenn $alt2 caccam $1 cachessia $3 @@ -894,7 +865,8 @@ cicer $1 cicladi $1 ciclocross $3 ciclope $alt -ciec $alt +ciec $alt +cigol $1 cigolio $3 ciliegi $alt ciliegia $3 $alt @@ -1716,11 +1688,13 @@ frassin $1 frattemp $alt freccine $2 freccette $alt2 -fredd $alt2 +fredd $alt2 +fregol $1 fren $alt2 frigia $1 frod $alt frondosi $2 +frugol $1 frullio $2 frumenzi $alt fruscii f@-*uS'i:j @@ -1950,7 +1924,7 @@ incorporea $3 incorporei $3 incorporeo $3 incub $1 -incursione $alt +incursion inkU@-*sj'On indebit $2 $alt2 indetraibil indet@-*a'ibil indirett $alt @@ -2069,7 +2043,7 @@ juventin juvent'in kairos $2 kampuchea $alt2 kapok $2 $alt -karate $3 +karate ka*at'e kayak $2 kea $alt2 kefir $alt @@ -2746,7 +2720,8 @@ ozia $2 pacec $alt padron $2 padroncine $3 -pagin $1 +pagane pag'ane +pagin $1 pagod $alt pahlavi $1 palagonia $4 @@ -2768,6 +2743,7 @@ pandosia $2 $alt pannocchia $alt panspermia $3 pantalon $3 +pantomima $3 papaver $2 paper $1 pappagorgia $3 @@ -3928,7 +3904,7 @@ thiesi $alt tholos $alt2 tiberiade $3 tiburon $3 -tiepol $alt +ticchettio tik:et:'io timpan $1 timoria $3 tindari $1 diff --git a/dictsource/it_rules b/dictsource/it_rules index 6b97f6db..633b1228 100644 --- a/dictsource/it_rules +++ b/dictsource/it_rules @@ -1,7 +1,7 @@ // Italian translation rules // This file is UTF-8 encoded -// Last update: 2016 july 8 by Chris +// Last update: 2016 september 8 by Chris // letter groups // A any vowel // C any consonant @@ -96,6 +96,8 @@ chiama (L07_ ki'a:ma a) cquista (L07_ k:w'ista re) cat (AL07_ k''at + chiedi (L04_ kj'EdI + chiudi (L04_ kj'udI .group d d d @@ -108,7 +110,7 @@ dona (L07_ d'ona // Pron.s verbs ci) der (L04_ =dE@-* divi) der (L04_ =de@-* - chAA) der (L04_ =de@-* +// chAA) der (L04_ =de@-* re) der (L04_ =de@-* @) dinano (_ =dina/no // verbs i) dano (_ =dano // verbs @@ -126,7 +128,7 @@ @t) ei (_ 'eI @) ey (_ =eI @C) e (_S1q e/ // lookup it_list without suffix - e (C_ E + e (C_ E e (A E e (C%A_ E _d) e (llA_ e @@ -144,7 +146,7 @@ _r) e E @) e (ci_ =e e (l E - r) e (m E + r) e (m E e (monA_ 'e e (nA_ E g) e (ne E @@ -170,8 +172,10 @@ @) e (volA_ 'e e (zA E CC) eggia (no_ 'EdZ:a - C) ender (L04_ 'ende@-* // Pron.s verbs + e (nder E + C) ender (L04_ 'Ende@-* // Pron.s verbs C) erder (L04_ 'E@-*de@-* + chi) eder (L04_ 'Ede@-* esser (L04_ 'EsseR _) ecco (L04 'Ek:o ete (L04_ 'ete @@ -355,6 +359,7 @@ _) m' (P2t m _) mezz' (P5t mEdz: metter (L04_ m'ette@-* // Pron.s Verbs + mmetter (L04_ m:'et:e@-* manda (L05_ m'anda mostra (L07_ m'Ost@-*a assu) mer (L04_ =me@-* @@ -467,6 +472,7 @@ ph f // foreign words @m) p (erY_ =p porta (L05_ p'O@-*ta // Pron.s verbs + _) paga (L07_ p'aga/ parla (L07_ p'a@-*la pie (gaL05_ pI'e prendi (L04_ p@-*'E:ndi @@ -557,14 +563,14 @@ L02) sei (_ _s'Ej .group t - t t - tt t: + t t + tt t: _) t' (P2t t @a) tria (_ t@-*'ia - @a) trie (_ t@-*'ie - a) ttoria (_ t:oR'ia - a) ttorie (_ t:oR'Ie - @) tt (ano_ =t: // verbs + @a) trie (_ t@-*'ie + a) ttoria (_ t:oR'ia + a) ttorie (_ t:oR'Ie + @) tt (ano_ =t: // verbs en) t (ano_ =t @ma) to (L06_ t'O @a) to (L06_ =to @@ -575,10 +581,11 @@ a) ta (si_ =ta _) togli (L04_ t'Ol^i trova (L07_ t@-*'Ova - _) tutt' (P5t tut: + tieni (L04_ tj'e/nI au) tentica (L07_ t'ENtIka/ a) ttiva (L07_ t:'iva L02) tre (_ t@-*'e + _) tutt' (P5t tut: .group u u u @@ -718,28 +725,28 @@ .group -gn n^ -ñ n^ -_L16_) : (_L17D_ _%%E_ // Say time + ñ n^ + ć (_ tS + _L16_) : (_L17D_ _%%E_ // Say time - á ''a - é ''e + á ''a + é ''e _) è (_ ,E A) è ''E C) è ''E - èi (K ''Ej - éi (K ''eI - ì ''i - í ''i - ó ''o - ói ''o|I - ò ''O - òi ''OI - ú ''u - ù ''u + èi (K ''Ej + éi (K ''eI + ì ''i + í ''i + ó ''o + ói ''o|I + ò ''O + òi ''OI + ú ''u + ù ''u D) , (D v'i@-*gola - __) - (_D meno + __) - (_D meno A_) - (_D _ C_) - (_D _ § pa*'ag@-*afO diff --git a/espeak-data/voices/!v/Andy b/espeak-ng-data/voices/!v/Andy similarity index 100% rename from espeak-data/voices/!v/Andy rename to espeak-ng-data/voices/!v/Andy diff --git a/espeak-data/voices/!v/Annie b/espeak-ng-data/voices/!v/Annie similarity index 100% rename from espeak-data/voices/!v/Annie rename to espeak-ng-data/voices/!v/Annie diff --git a/espeak-data/voices/!v/AnxiousAndy b/espeak-ng-data/voices/!v/AnxiousAndy similarity index 100% rename from espeak-data/voices/!v/AnxiousAndy rename to espeak-ng-data/voices/!v/AnxiousAndy diff --git a/espeak-data/voices/!v/Denis b/espeak-ng-data/voices/!v/Denis similarity index 100% rename from espeak-data/voices/!v/Denis rename to espeak-ng-data/voices/!v/Denis diff --git a/espeak-data/voices/!v/Gene b/espeak-ng-data/voices/!v/Gene similarity index 100% rename from espeak-data/voices/!v/Gene rename to espeak-ng-data/voices/!v/Gene diff --git a/espeak-data/voices/!v/Gene2 b/espeak-ng-data/voices/!v/Gene2 similarity index 100% rename from espeak-data/voices/!v/Gene2 rename to espeak-ng-data/voices/!v/Gene2 diff --git a/espeak-data/voices/!v/Jacky b/espeak-ng-data/voices/!v/Jacky similarity index 100% rename from espeak-data/voices/!v/Jacky rename to espeak-ng-data/voices/!v/Jacky diff --git a/espeak-data/voices/!v/Lee b/espeak-ng-data/voices/!v/Lee similarity index 100% rename from espeak-data/voices/!v/Lee rename to espeak-ng-data/voices/!v/Lee diff --git a/espeak-data/voices/!v/Mario b/espeak-ng-data/voices/!v/Mario similarity index 100% rename from espeak-data/voices/!v/Mario rename to espeak-ng-data/voices/!v/Mario diff --git a/espeak-data/voices/!v/Michael b/espeak-ng-data/voices/!v/Michael similarity index 100% rename from espeak-data/voices/!v/Michael rename to espeak-ng-data/voices/!v/Michael diff --git a/espeak-data/voices/!v/Mr serious b/espeak-ng-data/voices/!v/Mr serious similarity index 100% rename from espeak-data/voices/!v/Mr serious rename to espeak-ng-data/voices/!v/Mr serious diff --git a/espeak-data/voices/!v/Storm b/espeak-ng-data/voices/!v/Storm similarity index 100% rename from espeak-data/voices/!v/Storm rename to espeak-ng-data/voices/!v/Storm diff --git a/espeak-data/voices/!v/Tweaky b/espeak-ng-data/voices/!v/Tweaky similarity index 100% rename from espeak-data/voices/!v/Tweaky rename to espeak-ng-data/voices/!v/Tweaky diff --git a/espeak-data/voices/!v/aunty b/espeak-ng-data/voices/!v/aunty similarity index 100% rename from espeak-data/voices/!v/aunty rename to espeak-ng-data/voices/!v/aunty diff --git a/espeak-data/voices/!v/boris b/espeak-ng-data/voices/!v/boris similarity index 100% rename from espeak-data/voices/!v/boris rename to espeak-ng-data/voices/!v/boris diff --git a/espeak-data/voices/!v/croak b/espeak-ng-data/voices/!v/croak similarity index 100% rename from espeak-data/voices/!v/croak rename to espeak-ng-data/voices/!v/croak diff --git a/espeak-data/voices/!v/f1 b/espeak-ng-data/voices/!v/f1 similarity index 100% rename from espeak-data/voices/!v/f1 rename to espeak-ng-data/voices/!v/f1 diff --git a/espeak-data/voices/!v/f2 b/espeak-ng-data/voices/!v/f2 similarity index 100% rename from espeak-data/voices/!v/f2 rename to espeak-ng-data/voices/!v/f2 diff --git a/espeak-data/voices/!v/f3 b/espeak-ng-data/voices/!v/f3 similarity index 100% rename from espeak-data/voices/!v/f3 rename to espeak-ng-data/voices/!v/f3 diff --git a/espeak-data/voices/!v/f4 b/espeak-ng-data/voices/!v/f4 similarity index 100% rename from espeak-data/voices/!v/f4 rename to espeak-ng-data/voices/!v/f4 diff --git a/espeak-data/voices/!v/f5 b/espeak-ng-data/voices/!v/f5 similarity index 100% rename from espeak-data/voices/!v/f5 rename to espeak-ng-data/voices/!v/f5 diff --git a/espeak-data/voices/!v/iven b/espeak-ng-data/voices/!v/iven similarity index 100% rename from espeak-data/voices/!v/iven rename to espeak-ng-data/voices/!v/iven diff --git a/espeak-data/voices/!v/iven2 b/espeak-ng-data/voices/!v/iven2 similarity index 100% rename from espeak-data/voices/!v/iven2 rename to espeak-ng-data/voices/!v/iven2 diff --git a/espeak-data/voices/!v/iven3 b/espeak-ng-data/voices/!v/iven3 similarity index 100% rename from espeak-data/voices/!v/iven3 rename to espeak-ng-data/voices/!v/iven3 diff --git a/espeak-data/voices/!v/john b/espeak-ng-data/voices/!v/john similarity index 100% rename from espeak-data/voices/!v/john rename to espeak-ng-data/voices/!v/john diff --git a/espeak-data/voices/!v/kaukovalta b/espeak-ng-data/voices/!v/kaukovalta similarity index 100% rename from espeak-data/voices/!v/kaukovalta rename to espeak-ng-data/voices/!v/kaukovalta diff --git a/espeak-data/voices/!v/klatt b/espeak-ng-data/voices/!v/klatt similarity index 100% rename from espeak-data/voices/!v/klatt rename to espeak-ng-data/voices/!v/klatt diff --git a/espeak-data/voices/!v/klatt2 b/espeak-ng-data/voices/!v/klatt2 similarity index 100% rename from espeak-data/voices/!v/klatt2 rename to espeak-ng-data/voices/!v/klatt2 diff --git a/espeak-data/voices/!v/klatt3 b/espeak-ng-data/voices/!v/klatt3 similarity index 100% rename from espeak-data/voices/!v/klatt3 rename to espeak-ng-data/voices/!v/klatt3 diff --git a/espeak-data/voices/!v/klatt4 b/espeak-ng-data/voices/!v/klatt4 similarity index 100% rename from espeak-data/voices/!v/klatt4 rename to espeak-ng-data/voices/!v/klatt4 diff --git a/espeak-data/voices/!v/linda b/espeak-ng-data/voices/!v/linda similarity index 100% rename from espeak-data/voices/!v/linda rename to espeak-ng-data/voices/!v/linda diff --git a/espeak-data/voices/!v/m1 b/espeak-ng-data/voices/!v/m1 similarity index 100% rename from espeak-data/voices/!v/m1 rename to espeak-ng-data/voices/!v/m1 diff --git a/espeak-data/voices/!v/m2 b/espeak-ng-data/voices/!v/m2 similarity index 100% rename from espeak-data/voices/!v/m2 rename to espeak-ng-data/voices/!v/m2 diff --git a/espeak-data/voices/!v/m3 b/espeak-ng-data/voices/!v/m3 similarity index 100% rename from espeak-data/voices/!v/m3 rename to espeak-ng-data/voices/!v/m3 diff --git a/espeak-data/voices/!v/m4 b/espeak-ng-data/voices/!v/m4 similarity index 100% rename from espeak-data/voices/!v/m4 rename to espeak-ng-data/voices/!v/m4 diff --git a/espeak-data/voices/!v/m5 b/espeak-ng-data/voices/!v/m5 similarity index 100% rename from espeak-data/voices/!v/m5 rename to espeak-ng-data/voices/!v/m5 diff --git a/espeak-data/voices/!v/m6 b/espeak-ng-data/voices/!v/m6 similarity index 100% rename from espeak-data/voices/!v/m6 rename to espeak-ng-data/voices/!v/m6 diff --git a/espeak-data/voices/!v/m7 b/espeak-ng-data/voices/!v/m7 similarity index 100% rename from espeak-data/voices/!v/m7 rename to espeak-ng-data/voices/!v/m7 diff --git a/espeak-data/voices/!v/max b/espeak-ng-data/voices/!v/max similarity index 100% rename from espeak-data/voices/!v/max rename to espeak-ng-data/voices/!v/max diff --git a/espeak-data/voices/!v/michel b/espeak-ng-data/voices/!v/michel similarity index 100% rename from espeak-data/voices/!v/michel rename to espeak-ng-data/voices/!v/michel diff --git a/espeak-data/voices/!v/norbert b/espeak-ng-data/voices/!v/norbert similarity index 100% rename from espeak-data/voices/!v/norbert rename to espeak-ng-data/voices/!v/norbert diff --git a/espeak-data/voices/!v/quincy b/espeak-ng-data/voices/!v/quincy similarity index 100% rename from espeak-data/voices/!v/quincy rename to espeak-ng-data/voices/!v/quincy diff --git a/espeak-data/voices/!v/rob b/espeak-ng-data/voices/!v/rob similarity index 100% rename from espeak-data/voices/!v/rob rename to espeak-ng-data/voices/!v/rob diff --git a/espeak-data/voices/!v/robert b/espeak-ng-data/voices/!v/robert similarity index 100% rename from espeak-data/voices/!v/robert rename to espeak-ng-data/voices/!v/robert diff --git a/espeak-data/voices/!v/steph b/espeak-ng-data/voices/!v/steph similarity index 100% rename from espeak-data/voices/!v/steph rename to espeak-ng-data/voices/!v/steph diff --git a/espeak-data/voices/!v/steph2 b/espeak-ng-data/voices/!v/steph2 similarity index 100% rename from espeak-data/voices/!v/steph2 rename to espeak-ng-data/voices/!v/steph2 diff --git a/espeak-data/voices/!v/steph3 b/espeak-ng-data/voices/!v/steph3 similarity index 100% rename from espeak-data/voices/!v/steph3 rename to espeak-ng-data/voices/!v/steph3 diff --git a/espeak-data/voices/!v/travis b/espeak-ng-data/voices/!v/travis similarity index 100% rename from espeak-data/voices/!v/travis rename to espeak-ng-data/voices/!v/travis diff --git a/espeak-data/voices/!v/whisper b/espeak-ng-data/voices/!v/whisper similarity index 100% rename from espeak-data/voices/!v/whisper rename to espeak-ng-data/voices/!v/whisper diff --git a/espeak-data/voices/!v/whisperf b/espeak-ng-data/voices/!v/whisperf similarity index 100% rename from espeak-data/voices/!v/whisperf rename to espeak-ng-data/voices/!v/whisperf diff --git a/espeak-data/voices/!v/zac b/espeak-ng-data/voices/!v/zac similarity index 100% rename from espeak-data/voices/!v/zac rename to espeak-ng-data/voices/!v/zac diff --git a/espeak-data/voices/aav/vi b/espeak-ng-data/voices/aav/vi similarity index 100% rename from espeak-data/voices/aav/vi rename to espeak-ng-data/voices/aav/vi diff --git a/espeak-data/voices/aav/vi-VN-x-central b/espeak-ng-data/voices/aav/vi-VN-x-central similarity index 100% rename from espeak-data/voices/aav/vi-VN-x-central rename to espeak-ng-data/voices/aav/vi-VN-x-central diff --git a/espeak-data/voices/aav/vi-VN-x-south b/espeak-ng-data/voices/aav/vi-VN-x-south similarity index 100% rename from espeak-data/voices/aav/vi-VN-x-south rename to espeak-ng-data/voices/aav/vi-VN-x-south diff --git a/espeak-data/voices/art/eo b/espeak-ng-data/voices/art/eo similarity index 100% rename from espeak-data/voices/art/eo rename to espeak-ng-data/voices/art/eo diff --git a/espeak-data/voices/art/ia b/espeak-ng-data/voices/art/ia similarity index 100% rename from espeak-data/voices/art/ia rename to espeak-ng-data/voices/art/ia diff --git a/espeak-data/voices/art/jbo b/espeak-ng-data/voices/art/jbo similarity index 100% rename from espeak-data/voices/art/jbo rename to espeak-ng-data/voices/art/jbo diff --git a/espeak-data/voices/art/lfn b/espeak-ng-data/voices/art/lfn similarity index 100% rename from espeak-data/voices/art/lfn rename to espeak-ng-data/voices/art/lfn diff --git a/espeak-data/voices/axm/hy b/espeak-ng-data/voices/axm/hy similarity index 100% rename from espeak-data/voices/axm/hy rename to espeak-ng-data/voices/axm/hy diff --git a/espeak-data/voices/axm/hy-arevmda b/espeak-ng-data/voices/axm/hy-arevmda similarity index 100% rename from espeak-data/voices/axm/hy-arevmda rename to espeak-ng-data/voices/axm/hy-arevmda diff --git a/espeak-data/voices/azc/nci b/espeak-ng-data/voices/azc/nci similarity index 100% rename from espeak-data/voices/azc/nci rename to espeak-ng-data/voices/azc/nci diff --git a/espeak-data/voices/bnt/sw b/espeak-ng-data/voices/bnt/sw similarity index 100% rename from espeak-data/voices/bnt/sw rename to espeak-ng-data/voices/bnt/sw diff --git a/espeak-data/voices/bnt/tn b/espeak-ng-data/voices/bnt/tn similarity index 100% rename from espeak-data/voices/bnt/tn rename to espeak-ng-data/voices/bnt/tn diff --git a/espeak-data/voices/ccs/ka b/espeak-ng-data/voices/ccs/ka similarity index 100% rename from espeak-data/voices/ccs/ka rename to espeak-ng-data/voices/ccs/ka diff --git a/espeak-data/voices/cel/cy b/espeak-ng-data/voices/cel/cy similarity index 100% rename from espeak-data/voices/cel/cy rename to espeak-ng-data/voices/cel/cy diff --git a/espeak-data/voices/cel/ga b/espeak-ng-data/voices/cel/ga similarity index 100% rename from espeak-data/voices/cel/ga rename to espeak-ng-data/voices/cel/ga diff --git a/espeak-data/voices/cel/gd b/espeak-ng-data/voices/cel/gd similarity index 100% rename from espeak-data/voices/cel/gd rename to espeak-ng-data/voices/cel/gd diff --git a/espeak-data/voices/cus/om b/espeak-ng-data/voices/cus/om similarity index 100% rename from espeak-data/voices/cus/om rename to espeak-ng-data/voices/cus/om diff --git a/espeak-data/voices/default b/espeak-ng-data/voices/default similarity index 100% rename from espeak-data/voices/default rename to espeak-ng-data/voices/default diff --git a/espeak-data/voices/dra/kn b/espeak-ng-data/voices/dra/kn similarity index 100% rename from espeak-data/voices/dra/kn rename to espeak-ng-data/voices/dra/kn diff --git a/espeak-data/voices/dra/ml b/espeak-ng-data/voices/dra/ml similarity index 100% rename from espeak-data/voices/dra/ml rename to espeak-ng-data/voices/dra/ml diff --git a/espeak-data/voices/dra/ta b/espeak-ng-data/voices/dra/ta similarity index 100% rename from espeak-data/voices/dra/ta rename to espeak-ng-data/voices/dra/ta diff --git a/espeak-data/voices/dra/te b/espeak-ng-data/voices/dra/te similarity index 100% rename from espeak-data/voices/dra/te rename to espeak-ng-data/voices/dra/te diff --git a/espeak-data/voices/esx/kl b/espeak-ng-data/voices/esx/kl similarity index 100% rename from espeak-data/voices/esx/kl rename to espeak-ng-data/voices/esx/kl diff --git a/espeak-data/voices/gmq/da b/espeak-ng-data/voices/gmq/da similarity index 100% rename from espeak-data/voices/gmq/da rename to espeak-ng-data/voices/gmq/da diff --git a/espeak-data/voices/gmq/is b/espeak-ng-data/voices/gmq/is similarity index 100% rename from espeak-data/voices/gmq/is rename to espeak-ng-data/voices/gmq/is diff --git a/espeak-data/voices/gmq/no b/espeak-ng-data/voices/gmq/no similarity index 100% rename from espeak-data/voices/gmq/no rename to espeak-ng-data/voices/gmq/no diff --git a/espeak-data/voices/gmq/sv b/espeak-ng-data/voices/gmq/sv similarity index 100% rename from espeak-data/voices/gmq/sv rename to espeak-ng-data/voices/gmq/sv diff --git a/espeak-data/voices/gmw/af b/espeak-ng-data/voices/gmw/af similarity index 100% rename from espeak-data/voices/gmw/af rename to espeak-ng-data/voices/gmw/af diff --git a/espeak-data/voices/gmw/de b/espeak-ng-data/voices/gmw/de similarity index 100% rename from espeak-data/voices/gmw/de rename to espeak-ng-data/voices/gmw/de diff --git a/espeak-data/voices/gmw/en b/espeak-ng-data/voices/gmw/en similarity index 100% rename from espeak-data/voices/gmw/en rename to espeak-ng-data/voices/gmw/en diff --git a/espeak-data/voices/gmw/en-029 b/espeak-ng-data/voices/gmw/en-029 similarity index 100% rename from espeak-data/voices/gmw/en-029 rename to espeak-ng-data/voices/gmw/en-029 diff --git a/espeak-data/voices/gmw/en-GB-scotland b/espeak-ng-data/voices/gmw/en-GB-scotland similarity index 100% rename from espeak-data/voices/gmw/en-GB-scotland rename to espeak-ng-data/voices/gmw/en-GB-scotland diff --git a/espeak-data/voices/gmw/en-GB-x-gbclan b/espeak-ng-data/voices/gmw/en-GB-x-gbclan similarity index 100% rename from espeak-data/voices/gmw/en-GB-x-gbclan rename to espeak-ng-data/voices/gmw/en-GB-x-gbclan diff --git a/espeak-data/voices/gmw/en-GB-x-gbcwmd b/espeak-ng-data/voices/gmw/en-GB-x-gbcwmd similarity index 100% rename from espeak-data/voices/gmw/en-GB-x-gbcwmd rename to espeak-ng-data/voices/gmw/en-GB-x-gbcwmd diff --git a/espeak-data/voices/gmw/en-GB-x-rp b/espeak-ng-data/voices/gmw/en-GB-x-rp similarity index 100% rename from espeak-data/voices/gmw/en-GB-x-rp rename to espeak-ng-data/voices/gmw/en-GB-x-rp diff --git a/espeak-data/voices/gmw/en-US b/espeak-ng-data/voices/gmw/en-US similarity index 100% rename from espeak-data/voices/gmw/en-US rename to espeak-ng-data/voices/gmw/en-US diff --git a/espeak-data/voices/gmw/nl b/espeak-ng-data/voices/gmw/nl similarity index 100% rename from espeak-data/voices/gmw/nl rename to espeak-ng-data/voices/gmw/nl diff --git a/espeak-data/voices/grk/el b/espeak-ng-data/voices/grk/el similarity index 100% rename from espeak-data/voices/grk/el rename to espeak-ng-data/voices/grk/el diff --git a/espeak-data/voices/grk/grc b/espeak-ng-data/voices/grk/grc similarity index 100% rename from espeak-data/voices/grk/grc rename to espeak-ng-data/voices/grk/grc diff --git a/espeak-data/voices/inc/as b/espeak-ng-data/voices/inc/as similarity index 100% rename from espeak-data/voices/inc/as rename to espeak-ng-data/voices/inc/as diff --git a/espeak-data/voices/inc/bn b/espeak-ng-data/voices/inc/bn similarity index 100% rename from espeak-data/voices/inc/bn rename to espeak-ng-data/voices/inc/bn diff --git a/espeak-data/voices/inc/gu b/espeak-ng-data/voices/inc/gu similarity index 100% rename from espeak-data/voices/inc/gu rename to espeak-ng-data/voices/inc/gu diff --git a/espeak-data/voices/inc/hi b/espeak-ng-data/voices/inc/hi similarity index 100% rename from espeak-data/voices/inc/hi rename to espeak-ng-data/voices/inc/hi diff --git a/espeak-data/voices/inc/mr b/espeak-ng-data/voices/inc/mr similarity index 100% rename from espeak-data/voices/inc/mr rename to espeak-ng-data/voices/inc/mr diff --git a/espeak-data/voices/inc/ne b/espeak-ng-data/voices/inc/ne similarity index 100% rename from espeak-data/voices/inc/ne rename to espeak-ng-data/voices/inc/ne diff --git a/espeak-data/voices/inc/or b/espeak-ng-data/voices/inc/or similarity index 100% rename from espeak-data/voices/inc/or rename to espeak-ng-data/voices/inc/or diff --git a/espeak-data/voices/inc/pa b/espeak-ng-data/voices/inc/pa similarity index 100% rename from espeak-data/voices/inc/pa rename to espeak-ng-data/voices/inc/pa diff --git a/espeak-data/voices/inc/si b/espeak-ng-data/voices/inc/si similarity index 100% rename from espeak-data/voices/inc/si rename to espeak-ng-data/voices/inc/si diff --git a/espeak-data/voices/inc/ur b/espeak-ng-data/voices/inc/ur similarity index 100% rename from espeak-data/voices/inc/ur rename to espeak-ng-data/voices/inc/ur diff --git a/espeak-data/voices/ine/sq b/espeak-ng-data/voices/ine/sq similarity index 100% rename from espeak-data/voices/ine/sq rename to espeak-ng-data/voices/ine/sq diff --git a/espeak-data/voices/ira/fa b/espeak-ng-data/voices/ira/fa similarity index 100% rename from espeak-data/voices/ira/fa rename to espeak-ng-data/voices/ira/fa diff --git a/espeak-data/voices/ira/fa-Latn b/espeak-ng-data/voices/ira/fa-Latn similarity index 100% rename from espeak-data/voices/ira/fa-Latn rename to espeak-ng-data/voices/ira/fa-Latn diff --git a/espeak-data/voices/ira/fa-en-us b/espeak-ng-data/voices/ira/fa-en-us similarity index 100% rename from espeak-data/voices/ira/fa-en-us rename to espeak-ng-data/voices/ira/fa-en-us diff --git a/espeak-data/voices/ira/ku b/espeak-ng-data/voices/ira/ku similarity index 100% rename from espeak-data/voices/ira/ku rename to espeak-ng-data/voices/ira/ku diff --git a/espeak-data/voices/itc/la b/espeak-ng-data/voices/itc/la similarity index 100% rename from espeak-data/voices/itc/la rename to espeak-ng-data/voices/itc/la diff --git a/espeak-data/voices/ko b/espeak-ng-data/voices/ko similarity index 100% rename from espeak-data/voices/ko rename to espeak-ng-data/voices/ko diff --git a/espeak-data/voices/mb/mb-af1 b/espeak-ng-data/voices/mb/mb-af1 similarity index 100% rename from espeak-data/voices/mb/mb-af1 rename to espeak-ng-data/voices/mb/mb-af1 diff --git a/espeak-data/voices/mb/mb-af1-en b/espeak-ng-data/voices/mb/mb-af1-en similarity index 100% rename from espeak-data/voices/mb/mb-af1-en rename to espeak-ng-data/voices/mb/mb-af1-en diff --git a/espeak-data/voices/mb/mb-br1 b/espeak-ng-data/voices/mb/mb-br1 similarity index 100% rename from espeak-data/voices/mb/mb-br1 rename to espeak-ng-data/voices/mb/mb-br1 diff --git a/espeak-data/voices/mb/mb-br2 b/espeak-ng-data/voices/mb/mb-br2 similarity index 100% rename from espeak-data/voices/mb/mb-br2 rename to espeak-ng-data/voices/mb/mb-br2 diff --git a/espeak-data/voices/mb/mb-br3 b/espeak-ng-data/voices/mb/mb-br3 similarity index 100% rename from espeak-data/voices/mb/mb-br3 rename to espeak-ng-data/voices/mb/mb-br3 diff --git a/espeak-data/voices/mb/mb-br4 b/espeak-ng-data/voices/mb/mb-br4 similarity index 100% rename from espeak-data/voices/mb/mb-br4 rename to espeak-ng-data/voices/mb/mb-br4 diff --git a/espeak-data/voices/mb/mb-cr1 b/espeak-ng-data/voices/mb/mb-cr1 similarity index 100% rename from espeak-data/voices/mb/mb-cr1 rename to espeak-ng-data/voices/mb/mb-cr1 diff --git a/espeak-data/voices/mb/mb-cz2 b/espeak-ng-data/voices/mb/mb-cz2 similarity index 100% rename from espeak-data/voices/mb/mb-cz2 rename to espeak-ng-data/voices/mb/mb-cz2 diff --git a/espeak-data/voices/mb/mb-de1 b/espeak-ng-data/voices/mb/mb-de1 similarity index 100% rename from espeak-data/voices/mb/mb-de1 rename to espeak-ng-data/voices/mb/mb-de1 diff --git a/espeak-data/voices/mb/mb-de1-en b/espeak-ng-data/voices/mb/mb-de1-en similarity index 100% rename from espeak-data/voices/mb/mb-de1-en rename to espeak-ng-data/voices/mb/mb-de1-en diff --git a/espeak-data/voices/mb/mb-de2 b/espeak-ng-data/voices/mb/mb-de2 similarity index 100% rename from espeak-data/voices/mb/mb-de2 rename to espeak-ng-data/voices/mb/mb-de2 diff --git a/espeak-data/voices/mb/mb-de2-en b/espeak-ng-data/voices/mb/mb-de2-en similarity index 100% rename from espeak-data/voices/mb/mb-de2-en rename to espeak-ng-data/voices/mb/mb-de2-en diff --git a/espeak-data/voices/mb/mb-de3 b/espeak-ng-data/voices/mb/mb-de3 similarity index 100% rename from espeak-data/voices/mb/mb-de3 rename to espeak-ng-data/voices/mb/mb-de3 diff --git a/espeak-data/voices/mb/mb-de3-en b/espeak-ng-data/voices/mb/mb-de3-en similarity index 100% rename from espeak-data/voices/mb/mb-de3-en rename to espeak-ng-data/voices/mb/mb-de3-en diff --git a/espeak-data/voices/mb/mb-de4 b/espeak-ng-data/voices/mb/mb-de4 similarity index 100% rename from espeak-data/voices/mb/mb-de4 rename to espeak-ng-data/voices/mb/mb-de4 diff --git a/espeak-data/voices/mb/mb-de4-en b/espeak-ng-data/voices/mb/mb-de4-en similarity index 100% rename from espeak-data/voices/mb/mb-de4-en rename to espeak-ng-data/voices/mb/mb-de4-en diff --git a/espeak-data/voices/mb/mb-de5 b/espeak-ng-data/voices/mb/mb-de5 similarity index 100% rename from espeak-data/voices/mb/mb-de5 rename to espeak-ng-data/voices/mb/mb-de5 diff --git a/espeak-data/voices/mb/mb-de5-en b/espeak-ng-data/voices/mb/mb-de5-en similarity index 100% rename from espeak-data/voices/mb/mb-de5-en rename to espeak-ng-data/voices/mb/mb-de5-en diff --git a/espeak-data/voices/mb/mb-de6 b/espeak-ng-data/voices/mb/mb-de6 similarity index 100% rename from espeak-data/voices/mb/mb-de6 rename to espeak-ng-data/voices/mb/mb-de6 diff --git a/espeak-data/voices/mb/mb-de6-en b/espeak-ng-data/voices/mb/mb-de6-en similarity index 100% rename from espeak-data/voices/mb/mb-de6-en rename to espeak-ng-data/voices/mb/mb-de6-en diff --git a/espeak-data/voices/mb/mb-de6-grc b/espeak-ng-data/voices/mb/mb-de6-grc similarity index 100% rename from espeak-data/voices/mb/mb-de6-grc rename to espeak-ng-data/voices/mb/mb-de6-grc diff --git a/espeak-data/voices/mb/mb-de7 b/espeak-ng-data/voices/mb/mb-de7 similarity index 100% rename from espeak-data/voices/mb/mb-de7 rename to espeak-ng-data/voices/mb/mb-de7 diff --git a/espeak-data/voices/mb/mb-ee1 b/espeak-ng-data/voices/mb/mb-ee1 similarity index 100% rename from espeak-data/voices/mb/mb-ee1 rename to espeak-ng-data/voices/mb/mb-ee1 diff --git a/espeak-data/voices/mb/mb-en1 b/espeak-ng-data/voices/mb/mb-en1 similarity index 100% rename from espeak-data/voices/mb/mb-en1 rename to espeak-ng-data/voices/mb/mb-en1 diff --git a/espeak-data/voices/mb/mb-es1 b/espeak-ng-data/voices/mb/mb-es1 similarity index 100% rename from espeak-data/voices/mb/mb-es1 rename to espeak-ng-data/voices/mb/mb-es1 diff --git a/espeak-data/voices/mb/mb-es2 b/espeak-ng-data/voices/mb/mb-es2 similarity index 100% rename from espeak-data/voices/mb/mb-es2 rename to espeak-ng-data/voices/mb/mb-es2 diff --git a/espeak-data/voices/mb/mb-fr1 b/espeak-ng-data/voices/mb/mb-fr1 similarity index 100% rename from espeak-data/voices/mb/mb-fr1 rename to espeak-ng-data/voices/mb/mb-fr1 diff --git a/espeak-data/voices/mb/mb-fr1-en b/espeak-ng-data/voices/mb/mb-fr1-en similarity index 100% rename from espeak-data/voices/mb/mb-fr1-en rename to espeak-ng-data/voices/mb/mb-fr1-en diff --git a/espeak-data/voices/mb/mb-fr4 b/espeak-ng-data/voices/mb/mb-fr4 similarity index 100% rename from espeak-data/voices/mb/mb-fr4 rename to espeak-ng-data/voices/mb/mb-fr4 diff --git a/espeak-data/voices/mb/mb-fr4-en b/espeak-ng-data/voices/mb/mb-fr4-en similarity index 100% rename from espeak-data/voices/mb/mb-fr4-en rename to espeak-ng-data/voices/mb/mb-fr4-en diff --git a/espeak-data/voices/mb/mb-gr2 b/espeak-ng-data/voices/mb/mb-gr2 similarity index 100% rename from espeak-data/voices/mb/mb-gr2 rename to espeak-ng-data/voices/mb/mb-gr2 diff --git a/espeak-data/voices/mb/mb-gr2-en b/espeak-ng-data/voices/mb/mb-gr2-en similarity index 100% rename from espeak-data/voices/mb/mb-gr2-en rename to espeak-ng-data/voices/mb/mb-gr2-en diff --git a/espeak-data/voices/mb/mb-hu1 b/espeak-ng-data/voices/mb/mb-hu1 similarity index 100% rename from espeak-data/voices/mb/mb-hu1 rename to espeak-ng-data/voices/mb/mb-hu1 diff --git a/espeak-data/voices/mb/mb-hu1-en b/espeak-ng-data/voices/mb/mb-hu1-en similarity index 100% rename from espeak-data/voices/mb/mb-hu1-en rename to espeak-ng-data/voices/mb/mb-hu1-en diff --git a/espeak-data/voices/mb/mb-ic1 b/espeak-ng-data/voices/mb/mb-ic1 similarity index 100% rename from espeak-data/voices/mb/mb-ic1 rename to espeak-ng-data/voices/mb/mb-ic1 diff --git a/espeak-data/voices/mb/mb-id1 b/espeak-ng-data/voices/mb/mb-id1 similarity index 100% rename from espeak-data/voices/mb/mb-id1 rename to espeak-ng-data/voices/mb/mb-id1 diff --git a/espeak-data/voices/mb/mb-ir1 b/espeak-ng-data/voices/mb/mb-ir1 similarity index 100% rename from espeak-data/voices/mb/mb-ir1 rename to espeak-ng-data/voices/mb/mb-ir1 diff --git a/espeak-data/voices/mb/mb-ir2 b/espeak-ng-data/voices/mb/mb-ir2 similarity index 100% rename from espeak-data/voices/mb/mb-ir2 rename to espeak-ng-data/voices/mb/mb-ir2 diff --git a/espeak-data/voices/mb/mb-it3 b/espeak-ng-data/voices/mb/mb-it3 similarity index 100% rename from espeak-data/voices/mb/mb-it3 rename to espeak-ng-data/voices/mb/mb-it3 diff --git a/espeak-data/voices/mb/mb-it4 b/espeak-ng-data/voices/mb/mb-it4 similarity index 100% rename from espeak-data/voices/mb/mb-it4 rename to espeak-ng-data/voices/mb/mb-it4 diff --git a/espeak-data/voices/mb/mb-la1 b/espeak-ng-data/voices/mb/mb-la1 similarity index 100% rename from espeak-data/voices/mb/mb-la1 rename to espeak-ng-data/voices/mb/mb-la1 diff --git a/espeak-data/voices/mb/mb-lt1 b/espeak-ng-data/voices/mb/mb-lt1 similarity index 100% rename from espeak-data/voices/mb/mb-lt1 rename to espeak-ng-data/voices/mb/mb-lt1 diff --git a/espeak-data/voices/mb/mb-lt2 b/espeak-ng-data/voices/mb/mb-lt2 similarity index 100% rename from espeak-data/voices/mb/mb-lt2 rename to espeak-ng-data/voices/mb/mb-lt2 diff --git a/espeak-data/voices/mb/mb-mx1 b/espeak-ng-data/voices/mb/mb-mx1 similarity index 100% rename from espeak-data/voices/mb/mb-mx1 rename to espeak-ng-data/voices/mb/mb-mx1 diff --git a/espeak-data/voices/mb/mb-mx2 b/espeak-ng-data/voices/mb/mb-mx2 similarity index 100% rename from espeak-data/voices/mb/mb-mx2 rename to espeak-ng-data/voices/mb/mb-mx2 diff --git a/espeak-data/voices/mb/mb-nl2 b/espeak-ng-data/voices/mb/mb-nl2 similarity index 100% rename from espeak-data/voices/mb/mb-nl2 rename to espeak-ng-data/voices/mb/mb-nl2 diff --git a/espeak-data/voices/mb/mb-nl2-en b/espeak-ng-data/voices/mb/mb-nl2-en similarity index 100% rename from espeak-data/voices/mb/mb-nl2-en rename to espeak-ng-data/voices/mb/mb-nl2-en diff --git a/espeak-data/voices/mb/mb-pl1 b/espeak-ng-data/voices/mb/mb-pl1 similarity index 100% rename from espeak-data/voices/mb/mb-pl1 rename to espeak-ng-data/voices/mb/mb-pl1 diff --git a/espeak-data/voices/mb/mb-pl1-en b/espeak-ng-data/voices/mb/mb-pl1-en similarity index 100% rename from espeak-data/voices/mb/mb-pl1-en rename to espeak-ng-data/voices/mb/mb-pl1-en diff --git a/espeak-data/voices/mb/mb-pt1 b/espeak-ng-data/voices/mb/mb-pt1 similarity index 100% rename from espeak-data/voices/mb/mb-pt1 rename to espeak-ng-data/voices/mb/mb-pt1 diff --git a/espeak-data/voices/mb/mb-ro1 b/espeak-ng-data/voices/mb/mb-ro1 similarity index 100% rename from espeak-data/voices/mb/mb-ro1 rename to espeak-ng-data/voices/mb/mb-ro1 diff --git a/espeak-data/voices/mb/mb-ro1-en b/espeak-ng-data/voices/mb/mb-ro1-en similarity index 100% rename from espeak-data/voices/mb/mb-ro1-en rename to espeak-ng-data/voices/mb/mb-ro1-en diff --git a/espeak-data/voices/mb/mb-sw1 b/espeak-ng-data/voices/mb/mb-sw1 similarity index 100% rename from espeak-data/voices/mb/mb-sw1 rename to espeak-ng-data/voices/mb/mb-sw1 diff --git a/espeak-data/voices/mb/mb-sw1-en b/espeak-ng-data/voices/mb/mb-sw1-en similarity index 100% rename from espeak-data/voices/mb/mb-sw1-en rename to espeak-ng-data/voices/mb/mb-sw1-en diff --git a/espeak-data/voices/mb/mb-sw2 b/espeak-ng-data/voices/mb/mb-sw2 similarity index 100% rename from espeak-data/voices/mb/mb-sw2 rename to espeak-ng-data/voices/mb/mb-sw2 diff --git a/espeak-data/voices/mb/mb-sw2-en b/espeak-ng-data/voices/mb/mb-sw2-en similarity index 100% rename from espeak-data/voices/mb/mb-sw2-en rename to espeak-ng-data/voices/mb/mb-sw2-en diff --git a/espeak-data/voices/mb/mb-tr1 b/espeak-ng-data/voices/mb/mb-tr1 similarity index 100% rename from espeak-data/voices/mb/mb-tr1 rename to espeak-ng-data/voices/mb/mb-tr1 diff --git a/espeak-data/voices/mb/mb-tr2 b/espeak-ng-data/voices/mb/mb-tr2 similarity index 100% rename from espeak-data/voices/mb/mb-tr2 rename to espeak-ng-data/voices/mb/mb-tr2 diff --git a/espeak-data/voices/mb/mb-us1 b/espeak-ng-data/voices/mb/mb-us1 similarity index 100% rename from espeak-data/voices/mb/mb-us1 rename to espeak-ng-data/voices/mb/mb-us1 diff --git a/espeak-data/voices/mb/mb-us2 b/espeak-ng-data/voices/mb/mb-us2 similarity index 100% rename from espeak-data/voices/mb/mb-us2 rename to espeak-ng-data/voices/mb/mb-us2 diff --git a/espeak-data/voices/mb/mb-us3 b/espeak-ng-data/voices/mb/mb-us3 similarity index 100% rename from espeak-data/voices/mb/mb-us3 rename to espeak-ng-data/voices/mb/mb-us3 diff --git a/espeak-data/voices/mb/mb-vz1 b/espeak-ng-data/voices/mb/mb-vz1 similarity index 100% rename from espeak-data/voices/mb/mb-vz1 rename to espeak-ng-data/voices/mb/mb-vz1 diff --git a/espeak-data/voices/poz/id b/espeak-ng-data/voices/poz/id similarity index 100% rename from espeak-data/voices/poz/id rename to espeak-ng-data/voices/poz/id diff --git a/espeak-data/voices/poz/ms b/espeak-ng-data/voices/poz/ms similarity index 100% rename from espeak-data/voices/poz/ms rename to espeak-ng-data/voices/poz/ms diff --git a/espeak-data/voices/roa/an b/espeak-ng-data/voices/roa/an similarity index 100% rename from espeak-data/voices/roa/an rename to espeak-ng-data/voices/roa/an diff --git a/espeak-data/voices/roa/ca b/espeak-ng-data/voices/roa/ca similarity index 100% rename from espeak-data/voices/roa/ca rename to espeak-ng-data/voices/roa/ca diff --git a/espeak-data/voices/roa/es b/espeak-ng-data/voices/roa/es similarity index 100% rename from espeak-data/voices/roa/es rename to espeak-ng-data/voices/roa/es diff --git a/espeak-data/voices/roa/es-419 b/espeak-ng-data/voices/roa/es-419 similarity index 100% rename from espeak-data/voices/roa/es-419 rename to espeak-ng-data/voices/roa/es-419 diff --git a/espeak-data/voices/roa/fr b/espeak-ng-data/voices/roa/fr similarity index 100% rename from espeak-data/voices/roa/fr rename to espeak-ng-data/voices/roa/fr diff --git a/espeak-data/voices/roa/fr-BE b/espeak-ng-data/voices/roa/fr-BE similarity index 100% rename from espeak-data/voices/roa/fr-BE rename to espeak-ng-data/voices/roa/fr-BE diff --git a/espeak-data/voices/roa/it b/espeak-ng-data/voices/roa/it similarity index 100% rename from espeak-data/voices/roa/it rename to espeak-ng-data/voices/roa/it diff --git a/espeak-data/voices/roa/pap b/espeak-ng-data/voices/roa/pap similarity index 100% rename from espeak-data/voices/roa/pap rename to espeak-ng-data/voices/roa/pap diff --git a/espeak-data/voices/roa/pt-BR b/espeak-ng-data/voices/roa/pt-BR similarity index 100% rename from espeak-data/voices/roa/pt-BR rename to espeak-ng-data/voices/roa/pt-BR diff --git a/espeak-data/voices/roa/pt-PT b/espeak-ng-data/voices/roa/pt-PT similarity index 100% rename from espeak-data/voices/roa/pt-PT rename to espeak-ng-data/voices/roa/pt-PT diff --git a/espeak-data/voices/roa/ro b/espeak-ng-data/voices/roa/ro similarity index 100% rename from espeak-data/voices/roa/ro rename to espeak-ng-data/voices/roa/ro diff --git a/espeak-data/voices/sai/gn b/espeak-ng-data/voices/sai/gn similarity index 100% rename from espeak-data/voices/sai/gn rename to espeak-ng-data/voices/sai/gn diff --git a/espeak-data/voices/sem/am b/espeak-ng-data/voices/sem/am similarity index 100% rename from espeak-data/voices/sem/am rename to espeak-ng-data/voices/sem/am diff --git a/espeak-data/voices/sem/mt b/espeak-ng-data/voices/sem/mt similarity index 100% rename from espeak-data/voices/sem/mt rename to espeak-ng-data/voices/sem/mt diff --git a/espeak-data/voices/sit/cmn b/espeak-ng-data/voices/sit/cmn similarity index 100% rename from espeak-data/voices/sit/cmn rename to espeak-ng-data/voices/sit/cmn diff --git a/espeak-data/voices/sit/my b/espeak-ng-data/voices/sit/my similarity index 100% rename from espeak-data/voices/sit/my rename to espeak-ng-data/voices/sit/my diff --git a/espeak-data/voices/sit/yue b/espeak-ng-data/voices/sit/yue similarity index 100% rename from espeak-data/voices/sit/yue rename to espeak-ng-data/voices/sit/yue diff --git a/espeak-data/voices/trk/az b/espeak-ng-data/voices/trk/az similarity index 100% rename from espeak-data/voices/trk/az rename to espeak-ng-data/voices/trk/az diff --git a/espeak-data/voices/trk/ky b/espeak-ng-data/voices/trk/ky similarity index 100% rename from espeak-data/voices/trk/ky rename to espeak-ng-data/voices/trk/ky diff --git a/espeak-data/voices/trk/tr b/espeak-ng-data/voices/trk/tr similarity index 100% rename from espeak-data/voices/trk/tr rename to espeak-ng-data/voices/trk/tr diff --git a/espeak-data/voices/trk/tt b/espeak-ng-data/voices/trk/tt similarity index 100% rename from espeak-data/voices/trk/tt rename to espeak-ng-data/voices/trk/tt diff --git a/espeak-data/voices/urj/et b/espeak-ng-data/voices/urj/et similarity index 100% rename from espeak-data/voices/urj/et rename to espeak-ng-data/voices/urj/et diff --git a/espeak-data/voices/urj/fi b/espeak-ng-data/voices/urj/fi similarity index 100% rename from espeak-data/voices/urj/fi rename to espeak-ng-data/voices/urj/fi diff --git a/espeak-data/voices/urj/hu b/espeak-ng-data/voices/urj/hu similarity index 100% rename from espeak-data/voices/urj/hu rename to espeak-ng-data/voices/urj/hu diff --git a/espeak-data/voices/xaq/eu b/espeak-ng-data/voices/xaq/eu similarity index 100% rename from espeak-data/voices/xaq/eu rename to espeak-ng-data/voices/xaq/eu diff --git a/espeak-data/voices/xaq/lt b/espeak-ng-data/voices/xaq/lt similarity index 100% rename from espeak-data/voices/xaq/lt rename to espeak-ng-data/voices/xaq/lt diff --git a/espeak-data/voices/xaq/lv b/espeak-ng-data/voices/xaq/lv similarity index 100% rename from espeak-data/voices/xaq/lv rename to espeak-ng-data/voices/xaq/lv diff --git a/espeak-data/voices/zls/bg b/espeak-ng-data/voices/zls/bg similarity index 100% rename from espeak-data/voices/zls/bg rename to espeak-ng-data/voices/zls/bg diff --git a/espeak-data/voices/zls/bs b/espeak-ng-data/voices/zls/bs similarity index 100% rename from espeak-data/voices/zls/bs rename to espeak-ng-data/voices/zls/bs diff --git a/espeak-data/voices/zls/cs b/espeak-ng-data/voices/zls/cs similarity index 100% rename from espeak-data/voices/zls/cs rename to espeak-ng-data/voices/zls/cs diff --git a/espeak-data/voices/zls/hr b/espeak-ng-data/voices/zls/hr similarity index 100% rename from espeak-data/voices/zls/hr rename to espeak-ng-data/voices/zls/hr diff --git a/espeak-data/voices/zls/mk b/espeak-ng-data/voices/zls/mk similarity index 100% rename from espeak-data/voices/zls/mk rename to espeak-ng-data/voices/zls/mk diff --git a/espeak-data/voices/zls/pl b/espeak-ng-data/voices/zls/pl similarity index 100% rename from espeak-data/voices/zls/pl rename to espeak-ng-data/voices/zls/pl diff --git a/espeak-data/voices/zls/ru b/espeak-ng-data/voices/zls/ru similarity index 100% rename from espeak-data/voices/zls/ru rename to espeak-ng-data/voices/zls/ru diff --git a/espeak-data/voices/zls/sk b/espeak-ng-data/voices/zls/sk similarity index 100% rename from espeak-data/voices/zls/sk rename to espeak-ng-data/voices/zls/sk diff --git a/espeak-data/voices/zls/sl b/espeak-ng-data/voices/zls/sl similarity index 100% rename from espeak-data/voices/zls/sl rename to espeak-ng-data/voices/zls/sl diff --git a/espeak-data/voices/zls/sr b/espeak-ng-data/voices/zls/sr similarity index 100% rename from espeak-data/voices/zls/sr rename to espeak-ng-data/voices/zls/sr diff --git a/phsource/ph_italian b/phsource/ph_italian index 14674e75..635b7641 100644 --- a/phsource/ph_italian +++ b/phsource/ph_italian @@ -1,6 +1,6 @@  //==================================================== -// Italian, last update 5 july 2016 by Chris +// Italian, last update 15 august 2016 by Chris //==================================================== phoneme : // Lengthen previous vowel by "length" @@ -103,7 +103,8 @@ phoneme o/ FMT(vwl_it/o_open, 80) ENDIF IF thisPh(isWordEnd) AND NOT prevPhW(a) THEN - FMT(vwl_it/o, 65) + length 150 + FMT(vowel/o_mid, 65) ENDIF FMT(vowel/o, 90) endphoneme diff --git a/src/espeak-ng.1.ronn b/src/espeak-ng.1.ronn index 47df34ca..4fcd5e87 100644 --- a/src/espeak-ng.1.ronn +++ b/src/espeak-ng.1.ronn @@ -55,7 +55,7 @@ words are provided then text is spoken from stdin a line at a time. Speed in words per minute, default is 160. * `-v `: - Use voice file of this name from espeak-data/voices. A variant can be + Use voice file of this name from espeak-ng-data/voices. A variant can be specified using +, such as af+m3. * `-w `: @@ -104,7 +104,7 @@ words are provided then text is spoken from stdin a line at a time. The character to use to join multi-letter phonemes in -x and --ipa output. * `--path=`: - Specifies the directory containing the espeak-data directory. + Specifies the directory containing the espeak-ng-data directory. * `--pho`: Write mbrola phoneme data (.pho) to stdout or to the file in --phonout. diff --git a/src/espeak-ng.c b/src/espeak-ng.c index c170be05..76407227 100644 --- a/src/espeak-ng.c +++ b/src/espeak-ng.c @@ -68,7 +68,7 @@ static const char *help_text = "-s \n" "\t Speed in approximate words per minute. The default is 175\n" "-v \n" - "\t Use voice file of this name from espeak-data/voices\n" + "\t Use voice file of this name from espeak-ng-data/voices\n" "-w \n" "\t Write speech to this WAV file, rather than speaking it directly\n" "-b\t Input text encoding, 1=UTF8, 2=8 bit, 4=16 bit \n" @@ -92,7 +92,7 @@ static const char *help_text = "\t Compile the phoneme data\n" "--ipa Write phonemes to stdout using International Phonetic Alphabet\n" "--path=\"\"\n" - "\t Specifies the directory containing the espeak-data directory\n" + "\t Specifies the directory containing the espeak-ng-data directory\n" "--pho Write mbrola phoneme data (.pho) to stdout or to the file in --phonout\n" "--phonout=\"\"\n" "\t Write phoneme output from -x -X --ipa and --pho to this file\n" @@ -108,7 +108,7 @@ static const char *help_text = "--tie=\n" "\t Use a tie character within multi-letter phoneme names.\n" "\t Default is U+361, z means ZWJ character.\n" - "--version Shows version number and date, and location of espeak-data\n" + "--version Shows version number and date, and location of espeak-ng-data\n" "--voices=\n" "\t List the available voices for the specified language.\n" "\t If is omitted, then list all voices.\n" @@ -326,7 +326,7 @@ int main(int argc, char **argv) FILE *f_text = NULL; char *p_text = NULL; FILE *f_phonemes_out = stdout; - char *data_path = NULL; // use default path for espeak-data + char *data_path = NULL; // use default path for espeak-ng-data int option_index = 0; int c; diff --git a/src/include/compat/sys/stat.h b/src/include/compat/sys/stat.h new file mode 100644 index 00000000..65e14e34 --- /dev/null +++ b/src/include/compat/sys/stat.h @@ -0,0 +1,45 @@ +/* Compatibility shim for + * + * Copyright (C) 2016 Reece H. Dunn + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, see: . + */ + +#ifndef SYS_STAT_H_COMPAT_SHIM +#define SYS_STAT_H_COMPAT_SHIM + +#ifdef _MSC_VER + +#if _MSC_VER >= 1600 // Visual C++ 10 (Visual Studio 2010) and above... +#include <../ucrt/sys/stat.h> +#else +#include <../include/sys/stat.h> +#endif + +#else + +#pragma GCC system_header // Silence "warning: #include_next is a GCC extension" +#include_next + +#endif + +#ifndef S_ISDIR +#define S_ISDIR(mode) (((mode) & S_IFMT) == S_IFDIR) +#endif + +#ifndef S_ISFIFO +#define S_ISFIFO(mode) (((mode) & S_IFMT) == _S_IFIFO) +#endif + +#endif diff --git a/src/include/espeak-ng/speak_lib.h b/src/include/espeak-ng/speak_lib.h index 2aabdcbc..b3a1aac9 100644 --- a/src/include/espeak-ng/speak_lib.h +++ b/src/include/espeak-ng/speak_lib.h @@ -197,7 +197,7 @@ ESPEAK_API int espeak_Initialize(espeak_AUDIO_OUTPUT output, int buflength, cons Value=0 gives a default of 200mS. This paramater is only used for AUDIO_OUTPUT_RETRIEVAL and AUDIO_OUTPUT_SYNCHRONOUS modes. - path: The directory which contains the espeak-data directory, or NULL for the default location. + path: The directory which contains the espeak-ng-data directory, or NULL for the default location. options: bit 0: 1=allow espeakEVENT_PHONEME events. bit 1: 1= espeakEVENT_PHONEME events give IPA phoneme names, not eSpeak phoneme names @@ -553,7 +553,7 @@ ESPEAK_API void espeak_CompileDictionary(const char *path, FILE *log, int flags) typedef struct { const char *name; // a given name for this voice. UTF8 string. const char *languages; // list of pairs of (byte) priority + (string) language (and dialect qualifier) - const char *identifier; // the filename for this voice within espeak-data/voices + const char *identifier; // the filename for this voice within espeak-ng-data/voices unsigned char gender; // 0=none 1=male, 2=female, unsigned char age; // 0=not specified, or age in years unsigned char variant; // only used when passed as a parameter to espeak_SetVoiceByProperties @@ -587,7 +587,7 @@ typedef struct { extern "C" #endif ESPEAK_API const espeak_VOICE **espeak_ListVoices(espeak_VOICE *voice_spec); -/* Reads the voice files from espeak-data/voices and creates an array of espeak_VOICE pointers. +/* Reads the voice files from espeak-ng-data/voices and creates an array of espeak_VOICE pointers. The list is terminated by a NULL pointer If voice_spec is NULL then all voices are listed. diff --git a/src/libespeak-ng/error.c b/src/libespeak-ng/error.c index ac5f830d..fe427b7d 100644 --- a/src/libespeak-ng/error.c +++ b/src/libespeak-ng/error.c @@ -86,7 +86,7 @@ ESPEAK_NG_API void espeak_ng_GetStatusCodeMessage(espeak_ng_STATUS status, char strncpy0(buffer, "Compile error", length); break; case ENS_VERSION_MISMATCH: - strncpy0(buffer, "Wrong version of espeak-data", length); + strncpy0(buffer, "Wrong version of espeak-ng-data", length); break; case ENS_FIFO_BUFFER_FULL: strncpy0(buffer, "The FIFO buffer is full", length); diff --git a/src/libespeak-ng/readclause.c b/src/libespeak-ng/readclause.c index e1ec5ea0..2c7135d6 100644 --- a/src/libespeak-ng/readclause.c +++ b/src/libespeak-ng/readclause.c @@ -800,7 +800,7 @@ static espeak_ng_STATUS LoadSoundFile(const char *fname, int index, espeak_ng_ER return EINVAL; if (fname[0] != '/') { - // a relative path, look in espeak-data/soundicons + // a relative path, look in espeak-ng-data/soundicons sprintf(fname2, "%s%csoundicons%c%s", path_home, PATHSEP, PATHSEP, fname); fname = fname2; } diff --git a/src/libespeak-ng/speech.c b/src/libespeak-ng/speech.c index 27395ba0..ca4bc641 100644 --- a/src/libespeak-ng/speech.c +++ b/src/libespeak-ng/speech.c @@ -56,10 +56,6 @@ #include "fifo.h" #include "event.h" -#ifndef S_ISDIR -#define S_ISDIR(mode) (((mode) & S_IFMT) == S_IFDIR) -#endif - unsigned char *outbuf = NULL; espeak_EVENT *event_list = NULL; @@ -82,7 +78,7 @@ t_espeak_callback *synth_callback = NULL; int (*uri_callback)(int, const char *, const char *) = NULL; int (*phoneme_callback)(const char *) = NULL; -char path_home[N_PATH_HOME]; // this is the espeak-data directory +char path_home[N_PATH_HOME]; // this is the espeak-ng-data directory extern int saved_parameters[N_SPEECH_PARAM]; // Parameters saved on synthesis start static int dispatch_audio(short *outbuf, int length, espeak_EVENT *event) @@ -272,7 +268,7 @@ int GetFileLength(const char *filename) ESPEAK_NG_API void espeak_ng_InitializePath(const char *path) { if (path != NULL) { - sprintf(path_home, "%s/espeak-data", path); + sprintf(path_home, "%s/espeak-ng-data", path); return; } @@ -284,9 +280,9 @@ ESPEAK_NG_API void espeak_ng_InitializePath(const char *path) unsigned char buf[sizeof(path_home)-13]; if ((env = getenv("ESPEAK_DATA_PATH")) != NULL) { - sprintf(path_home, "%s/espeak-data", env); + sprintf(path_home, "%s/espeak-ng-data", env); if (GetFileLength(path_home) == -2) - return; // an espeak-data directory exists + return; // an espeak-ng-data directory exists } buf[0] = 0; @@ -295,7 +291,7 @@ ESPEAK_NG_API void espeak_ng_InitializePath(const char *path) var_type = REG_SZ; RegQueryValueExA(RegKey, "Path", 0, &var_type, buf, &size); - sprintf(path_home, "%s\\espeak-data", buf); + sprintf(path_home, "%s\\espeak-ng-data", buf); #elif defined(PLATFORM_DOS) strcpy(path_home, PATH_ESPEAK_DATA); #else @@ -303,12 +299,12 @@ ESPEAK_NG_API void espeak_ng_InitializePath(const char *path) // check for environment variable if ((env = getenv("ESPEAK_DATA_PATH")) != NULL) { - snprintf(path_home, sizeof(path_home), "%s/espeak-data", env); + snprintf(path_home, sizeof(path_home), "%s/espeak-ng-data", env); if (GetFileLength(path_home) == -2) - return; // an espeak-data directory exists + return; // an espeak-ng-data directory exists } - snprintf(path_home, sizeof(path_home), "%s/espeak-data", getenv("HOME")); + snprintf(path_home, sizeof(path_home), "%s/espeak-ng-data", getenv("HOME")); if (access(path_home, R_OK) != 0) strcpy(path_home, PATH_ESPEAK_DATA); #endif diff --git a/src/libespeak-ng/speech.h b/src/libespeak-ng/speech.h index 32cb334b..b5a50d30 100644 --- a/src/libespeak-ng/speech.h +++ b/src/libespeak-ng/speech.h @@ -52,7 +52,7 @@ extern "C" // will look for espeak_data directory here, and also in user's home directory #ifndef PATH_ESPEAK_DATA - #define PATH_ESPEAK_DATA "/usr/share/espeak-data" + #define PATH_ESPEAK_DATA "/usr/share/espeak-ng-data" #endif typedef unsigned short USHORT; @@ -65,7 +65,7 @@ typedef struct { } MNEM_TAB; int LookupMnem(MNEM_TAB *table, const char *string); -extern char path_home[N_PATH_HOME]; // this is the espeak-data directory +extern char path_home[N_PATH_HOME]; // this is the espeak-ng-data directory extern ESPEAK_NG_API void strncpy0(char *to, const char *from, int size); extern ESPEAK_NG_API int GetFileLength(const char *filename); diff --git a/src/libespeak-ng/synth_mbrola.c b/src/libespeak-ng/synth_mbrola.c index 870e4a17..8b61e794 100644 --- a/src/libespeak-ng/synth_mbrola.c +++ b/src/libespeak-ng/synth_mbrola.c @@ -55,7 +55,7 @@ static int mbr_name_prefix = 0; espeak_ng_STATUS LoadMbrolaTable(const char *mbrola_voice, const char *phtrans, int *srate) { - // Load a phoneme name translation table from espeak-data/mbrola + // Load a phoneme name translation table from espeak-ng-data/mbrola int size; int ix; diff --git a/src/libespeak-ng/voices.c b/src/libespeak-ng/voices.c index ef7b868d..d01ed81f 100644 --- a/src/libespeak-ng/voices.c +++ b/src/libespeak-ng/voices.c @@ -1228,7 +1228,7 @@ espeak_VOICE *SelectVoiceByName(espeak_VOICE **voices, const char *name2) int match_fname = -1; int match_fname2 = -1; int match_name = -1; - const char *id; // this is the filename within espeak-data/voices + const char *id; // this is the filename within espeak-ng-data/voices char *variant_name; int last_part_len; char last_part[41]; diff --git a/src/speak-ng.1.ronn b/src/speak-ng.1.ronn index 71f0b5aa..25c607f2 100644 --- a/src/speak-ng.1.ronn +++ b/src/speak-ng.1.ronn @@ -51,7 +51,7 @@ words are provided then text is spoken from stdin a line at a time. Speed in words per minute, default is 160. * `-v `: - Use voice file of this name from espeak-data/voices. A variant can be + Use voice file of this name from espeak-ng-data/voices. A variant can be specified using +, such as af+m3. * `-w `: @@ -100,7 +100,7 @@ words are provided then text is spoken from stdin a line at a time. The character to use to join multi-letter phonemes in -x and --ipa output. * `--path=`: - Specifies the directory containing the espeak-data directory. + Specifies the directory containing the espeak-ng-data directory. * `--pho`: Write mbrola phoneme data (.pho) to stdout or to the file in --phonout. diff --git a/src/windows/data.vcxproj b/src/windows/data.vcxproj index 69bef8bb..dbf98323 100644 --- a/src/windows/data.vcxproj +++ b/src/windows/data.vcxproj @@ -72,244 +72,247 @@ - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + + + + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + diff --git a/src/windows/installer/Product.wxs b/src/windows/installer/Product.wxs index 01e1a2ae..afdd6731 100644 --- a/src/windows/installer/Product.wxs +++ b/src/windows/installer/Product.wxs @@ -179,6 +179,9 @@ + + + @@ -309,12 +312,14 @@ + @@ -337,583 +342,589 @@ - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + + + + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + + + + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + @@ -1154,6 +1165,10 @@ + + + +