From 897237bcf16f0174733d91293d1889822a471fce Mon Sep 17 00:00:00 2001 From: jonsd Date: Thu, 4 Dec 2008 15:40:32 +0000 Subject: [PATCH] Phonetables: Use "length" field in Tone phonemes to adjust the lengths of the vowel. git-svn-id: https://espeak.svn.sourceforge.net/svnroot/espeak/trunk@206 d46cf337-b52f-0410-862d-fd96e6ae7743 --- dictsource/es_list | 5 +++-- dictsource/vi_list | 4 ++-- phsource/compile_report | 7 ++++--- phsource/envelope/vi_5amp | 10 +++++----- phsource/envelope/vi_6amp | 19 ++++++++----------- phsource/l/L2_uL | Bin 3171 -> 3171 bytes phsource/ph_english | 2 +- phsource/ph_english_rp | 1 - phsource/ph_vi | 10 ++-------- phsource/phonemes | 22 +++++++++++++--------- phsource/vwl_cy/I%% | Bin 5806 -> 0 bytes phsource/vwl_de/3 | Bin 6015 -> 0 bytes phsource/vwl_de/r_I | Bin 1980 -> 0 bytes phsource/vwl_de/r_O | Bin 6981 -> 0 bytes phsource/vwl_de/r_U | Bin 8015 -> 0 bytes phsource/vwl_de/r_a | Bin 1975 -> 0 bytes phsource/vwl_de/r_aa | Bin 5203 -> 0 bytes phsource/vwl_de/r_e | Bin 6017 -> 0 bytes phsource/vwl_de/r_ee | Bin 7873 -> 0 bytes phsource/vwl_de/r_y | Bin 10627 -> 0 bytes phsource/vwl_en/i | Bin 9661 -> 0 bytes phsource/vwl_en/u_L | Bin 6774 -> 0 bytes phsource/vwl_fi/y | Bin 10625 -> 0 bytes phsource/vwl_fi/y_3 | Bin 10625 -> 0 bytes src/compiledata.cpp | 21 +++++++++++++++++++-- src/intonation.cpp | 2 +- src/setlengths.cpp | 10 ++++++++++ src/tr_languages.cpp | 8 +++++++- src/wavegen.cpp | 2 +- 29 files changed, 76 insertions(+), 47 deletions(-) delete mode 100644 phsource/vwl_cy/I%% delete mode 100644 phsource/vwl_de/3 delete mode 100644 phsource/vwl_de/r_I delete mode 100644 phsource/vwl_de/r_O delete mode 100644 phsource/vwl_de/r_U delete mode 100644 phsource/vwl_de/r_a delete mode 100644 phsource/vwl_de/r_aa delete mode 100644 phsource/vwl_de/r_e delete mode 100644 phsource/vwl_de/r_ee delete mode 100644 phsource/vwl_de/r_y delete mode 100644 phsource/vwl_en/i delete mode 100644 phsource/vwl_en/u_L delete mode 100644 phsource/vwl_fi/y delete mode 100644 phsource/vwl_fi/y_3 diff --git a/dictsource/es_list b/dictsource/es_list index 48ec0b87..369ff273 100644 --- a/dictsource/es_list +++ b/dictsource/es_list @@ -7,6 +7,9 @@ _cap m'aJ^us // should be "mayúscula" after the letter? _?? s'imbOlo _#32 Esp'aTjo +// NOTE: Some of these pronunciations may still be in +// Spanish, and need to be changed. + // accent names _lig liQaD'u**a _acu aQ'uDo @@ -26,8 +29,6 @@ _stk b'a*Ra // ?? _tld t'ilde - - // names of symbols _. punto _, koma diff --git a/dictsource/vi_list b/dictsource/vi_list index 787634a4..cf95e593 100644 --- a/dictsource/vi_list +++ b/dictsource/vi_list @@ -60,15 +60,15 @@ _75 _b'aI4||m'y@2j||l'a7m _85 t['a:3m||m'y@2j||l'a7m _95 c'i3n||m'y@2j||l'a7m - _0C cr'am // trăm _0M1 N'a:2n // ngàn _0M2 cr'i@6w // triệu _0M3 t['i4 // tỷ _0and l,in^ // linh +_dpt _f,@I4_ // symbols - +_, f@I4 // ?? found in festival wow_vi_ptn_phrasing.scm bị $u diff --git a/phsource/compile_report b/phsource/compile_report index 1768ed6f..c9c962f8 100644 --- a/phsource/compile_report +++ b/phsource/compile_report @@ -1,4 +1,4 @@ -61 phoneme tables +62 phoneme tables new total base 103 103 base2 24 122 @@ -61,6 +61,7 @@ om 25 125 en_klatt 77 149 ga 18 117 + mr 1 148 Data file Used by b/b [b] base @@ -2321,7 +2322,8 @@ vowel/u_bck [u] base2 [u:] ga vowel/u_bck2 [u:] la [u] sq -vowel/u_fnt [u:] en_rp +vowel/u_fnt [u:] en + [u:] en_rp vowel/uu [U] en [U] en_n [U] en_wm @@ -2431,7 +2433,6 @@ vwl_en_rp/aa [A:] en_rp [aa] en_rp vwl_en_rp/aU@ [aU@] en_rp vwl_en_rp/i@ [i@] en_rp -vwl_en/u_L [u:] en vwl_en_us/3_us [3] en_us vwl_en_us/3_us2 [3:] en_us vwl_en_us/a [a] en_us diff --git a/phsource/envelope/vi_5amp b/phsource/envelope/vi_5amp index 5bdb193e..61814aab 100644 --- a/phsource/envelope/vi_5amp +++ b/phsource/envelope/vi_5amp @@ -1,6 +1,6 @@ ENVELOPE -0 95 -33 95 -49 55 -65 95 -100 95 +0 60 1 +35 60 +42 36 +60 60 1 +100 55 diff --git a/phsource/envelope/vi_6amp b/phsource/envelope/vi_6amp index 4a80950e..9d0f3a24 100644 --- a/phsource/envelope/vi_6amp +++ b/phsource/envelope/vi_6amp @@ -1,15 +1,12 @@ ENVELOPE -0 100 -34 100 -47 66 -64 100 -73 100 -74 0 -85 95 -86 95 -92 95 -94 0 -100 0 +0 50 1 +40 50 +50 33 +68 50 1 +77 50 +78 0 +88 50 1 +100 50 diff --git a/phsource/l/L2_uL b/phsource/l/L2_uL index 0a347b13a8b33bd074af4c070ace2bdf2b345d18..a535f6f2bb34dfadd06b2e4321842c7728c9e7ef 100644 GIT binary patch delta 73 zcmaDX@mOMlzW4?P2ykHCngC(N0;#BtZsDwop1;-8B delta 73 zcmaDX@mOMlzWBzBA_fp}VBMMkW-!D8sg#Xw;jD@&V1W}13>*WnlR%>XZ^ z=?BMu{mGy=4;}v30f;m3)(P&<#y;0-Ufgj2&TpgJ=uK^R&6_aVq;1lk;1QY=T%++r zeyB>y(^N^%<60$0Q>$n+Jx~vHPTj9Lr)o6Y(6*;b&@?&yGaljgGVahJ!25Yz>e