From f1602ba8d15302aed34efd71a6521121b5293f46 Mon Sep 17 00:00:00 2001 From: Valdis Vitolins Date: Sun, 8 Apr 2018 20:05:15 +0300 Subject: [PATCH] fr: remove number from phoneme translation file, as it can be used for all MBROLA voices There are small differences for diphone sets, but these are not used from eSpeak NG. --- Makefile.am | 6 +++--- espeak-ng-data/voices/mb/mb-fr1 | 2 +- espeak-ng-data/voices/mb/mb-fr1-en | 2 +- espeak-ng-data/voices/mb/mb-fr4 | 2 +- espeak-ng-data/voices/mb/mb-fr4-en | 2 +- phsource/mbrola/{fr1 => fr} | 0 6 files changed, 7 insertions(+), 7 deletions(-) rename phsource/mbrola/{fr1 => fr} (100%) diff --git a/Makefile.am b/Makefile.am index 6f20a259..eb8cab0c 100644 --- a/Makefile.am +++ b/Makefile.am @@ -843,7 +843,7 @@ mbrola: \ 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/fr_phtrans \ espeak-ng-data/mbrola_ph/gr2_phtrans \ espeak-ng-data/mbrola_ph/grc-de6_phtrans \ espeak-ng-data/mbrola_ph/hn1_phtrans \ @@ -918,9 +918,9 @@ 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-ng-data/mbrola_ph/fr1_phtrans: phsource/mbrola/fr1 src/espeak-ng +espeak-ng-data/mbrola_ph/fr_phtrans: phsource/mbrola/fr src/espeak-ng mkdir -p espeak-ng-data/mbrola_ph - ESPEAK_DATA_PATH=$(PWD) src/espeak-ng --compile-mbrola=phsource/mbrola/fr1 + ESPEAK_DATA_PATH=$(PWD) src/espeak-ng --compile-mbrola=phsource/mbrola/fr espeak-ng-data/mbrola_ph/gr2_phtrans: phsource/mbrola/gr2 src/espeak-ng mkdir -p espeak-ng-data/mbrola_ph diff --git a/espeak-ng-data/voices/mb/mb-fr1 b/espeak-ng-data/voices/mb/mb-fr1 index 04651527..29cc988c 100644 --- a/espeak-ng-data/voices/mb/mb-fr1 +++ b/espeak-ng-data/voices/mb/mb-fr1 @@ -7,5 +7,5 @@ stressLength 180 180 180 180 0 0 220 220 pitch 82 117 voicing 70 -mbrola fr1 fr1_phtrans +mbrola fr1 fr_phtrans diff --git a/espeak-ng-data/voices/mb/mb-fr1-en b/espeak-ng-data/voices/mb/mb-fr1-en index 47cb1825..b39db344 100644 --- a/espeak-ng-data/voices/mb/mb-fr1-en +++ b/espeak-ng-data/voices/mb/mb-fr1-en @@ -5,5 +5,5 @@ gender male dictrules 1 pitch 82 117 voicing 70 -mbrola fr1 fr1_phtrans +mbrola fr1 fr_phtrans diff --git a/espeak-ng-data/voices/mb/mb-fr4 b/espeak-ng-data/voices/mb/mb-fr4 index 8e3c3921..244a6212 100644 --- a/espeak-ng-data/voices/mb/mb-fr4 +++ b/espeak-ng-data/voices/mb/mb-fr4 @@ -5,5 +5,5 @@ gender female dictrules 1 pitch 140 220 voicing 90 -mbrola fr1 fr1_phtrans +mbrola fr1 fr_phtrans diff --git a/espeak-ng-data/voices/mb/mb-fr4-en b/espeak-ng-data/voices/mb/mb-fr4-en index 8126770b..f266edf4 100644 --- a/espeak-ng-data/voices/mb/mb-fr4-en +++ b/espeak-ng-data/voices/mb/mb-fr4-en @@ -5,5 +5,5 @@ gender female dictrules 1 pitch 140 220 voicing 90 -mbrola fr1 fr1_phtrans +mbrola fr1 fr_phtrans diff --git a/phsource/mbrola/fr1 b/phsource/mbrola/fr similarity index 100% rename from phsource/mbrola/fr1 rename to phsource/mbrola/fr