From 73e45f9c05e009e5a537e9bd91c09d63a3668bb6 Mon Sep 17 00:00:00 2001 From: jonsd Date: Sat, 2 Jun 2007 15:23:29 +0000 Subject: [PATCH] [1.265.16] git-svn-id: https://espeak.svn.sourceforge.net/svnroot/espeak/trunk@32 d46cf337-b52f-0410-862d-fd96e6ae7743 --- dictsource/de_rules | 24 +++++++++++++++++++----- dictsource/dict_phonemes | 28 ++++++++++++++-------------- dictsource/en_list | 2 ++ dictsource/en_rules | 2 ++ dictsource/pt_list | 5 +++-- dictsource/pt_rules | 4 ++++ phsource/vowel/oo | Bin 1247 -> 1248 bytes phsource/vowel/uu_2 | Bin 8016 -> 8016 bytes src/synthdata.cpp | 2 +- src/tr_languages.cpp | 1 + src/voices.cpp | 2 +- 11 files changed, 47 insertions(+), 23 deletions(-) diff --git a/dictsource/de_rules b/dictsource/de_rules index 6ff56530..90367c2e 100644 --- a/dictsource/de_rules +++ b/dictsource/de_rules @@ -11,6 +11,7 @@ a (C% a a (CC a a (sch a + &CC) a (_ =A: ai aI ay aI @@ -32,6 +33,7 @@ @A) al (_ 'al @) an (_ 'an @) ant (_ 'ant + _) anthropo ,ant@-*o:p%o: @) atisch (_S6 'A:tIS @) atisieren (_S9 A:tIs'i:*@n anier (_ 'A:ni:3 @@ -140,6 +142,7 @@ ell (_ 'El &) e (_$1 @ + @t) e (_S1 @ &) e (BB_ E2 e (gt_+ e: &) el (_ @l @@ -149,10 +152,11 @@ @) er (r E* @) er (nC E* @) er (_$2 3 - &) ere (_ @*@ - &) eren (_$1 n - &) erer (_ @*3 - &) eres (_$1 s + &) ere (_$3 @*@ + &) erem (_$4 @*@m + &) eren (_$4 @*@n + &) erer (_$4 @*3 + &) eres (_$4 @*@s &) er (C_ @* &) er (n_ @r &) er (r_ E @@ -172,6 +176,7 @@ &) erung (_ =@*UN _) ein (@P3 'aIn + ein (and _|%aIn _) emp (@P3 _|%Emp _) ent (@P3 _|%Ent _) enten Ent@n @@ -248,6 +253,7 @@ _) haupt (@@P5 h'aUpt _) high _^_EN + _) hinter (@ h,Int3 _) hyper _^_EN @@ -262,11 +268,13 @@ i (CC I i (sch I @) i (ng I + &CC) i (_ =i: &) ie (ll_ i:,E &) ier (_ 'i:3 r) ien (@ IEn &) ien (_S1 n + &n) ien (_ I@n &) iens (_ =I;@ns &) ient (_ =I;@nt sch) ie (n i: @@ -315,6 +323,7 @@ @) lich (_$4 lIC lady _^_EN + @) lo (gisch l'o: .group m _) m (_ Em @@ -355,6 +364,7 @@ o (C% O o (CC O o (sch O + &CC) o (_ =o: _) ober (@P4 _|,o:b3 _) ober (ste o:b3 @@ -450,6 +460,7 @@ thrill _^_EN @) tient (_ tsI'Ent @) tion (_ tsI'o:n + @) ti (v_ t'i: _) trail _^_EN _) train _^_EN _) tranqu _^_EN @@ -481,6 +492,9 @@ @) uerisch (_ 'u:*IS _) user _^_EN + _) ueber (@P5 _|,y:b3 + + .group v _) v (_ faU v v @@ -517,7 +531,7 @@ .group y - _) y (_ UpsIlOn + _) y (_ ypsIlOn y y: y (CC y diff --git a/dictsource/dict_phonemes b/dictsource/dict_phonemes index ece25314..2684cf59 100644 --- a/dictsource/dict_phonemes +++ b/dictsource/dict_phonemes @@ -208,20 +208,6 @@ t t; tS ts ts; v w x z Z Z; -Dictionary pt_dict - -& &/ &U~ &~ @ @- a A -aI aU e E eI EI eU EU -i i/ iU i~ o O oI OI -o~ U u uI u~ y - -* : ; b C d dZ f -g h j k l l^ m n -N n^ p Q r R r- s -S s# s; t T tS ts v -w x z Z - - Dictionary ru_dict 8 @- A a E e E# E2 @@ -294,6 +280,20 @@ l m n N p r s t tS v w z +Dictionary pt_dict + +& &/ &U~ &~ @ @- a A +aI aU e E eI EI eU EU +i i/ iU i~ o O oI OI +o~ U u uI u~ y + +* : ; b C d dZ f +g h j k l l^ m n +N n^ p Q r R r- s +S s# s; t T tS ts v +w x z Z + + Dictionary ro_dict @ @- @I @U a aI aU e diff --git a/dictsource/en_list b/dictsource/en_list index 2c51a92f..ff86babf 100644 --- a/dictsource/en_list +++ b/dictsource/en_list @@ -987,6 +987,7 @@ impedance I2mpi:d@ns imperative I2mpEr@tIv impi $1 imprecise I2mprIs'aIs +impregnable I2mprEgn@b@L inappropriate ,Ina2proUpri@t incense Ins'Ens $verb incoming InkVmI2N @@ -2056,6 +2057,7 @@ Memphis mEmfIs Mexico $1 Milan $2 Mindanao mInd@n'aU +Minneapolis mIni:'ap@lI2s Missouri mIs'U@rI Montreal m0ntrI'O:l Morocco m@r0koU diff --git a/dictsource/en_rules b/dictsource/en_rules index 76312fba..6064c806 100644 --- a/dictsource/en_rules +++ b/dictsource/en_rules @@ -3102,6 +3102,7 @@ _) jere (C dZEr@ _) jes (ui dZEz _) joa (n@ dZoU'a + j (ü j .group k k k @@ -4467,6 +4468,7 @@ for) tuna (t tS@n@ s) t (l to (morr t@ + _) to (nn tV @) town (_$4 taUn _) tri (A traI _) trie traI diff --git a/dictsource/pt_list b/dictsource/pt_list index 8b431ce6..426c8689 100755 --- a/dictsource/pt_list +++ b/dictsource/pt_list @@ -103,7 +103,7 @@ _8 'oItu ?1_13 tR'ezy ?2_13 tR'ezi ?1_14 k&t'orzy -?2_14 kat'Orzi +?2_14 kat'orzi ?1_15 k'iNzy ?2_15 k'iNzi ?1_16 dyz&s'eis# @@ -558,7 +558,7 @@ jogos $alt // Open [E] nela n'El& nessa n'Es& -era 'Er& +era 'E*& abacaxi abakaSi axé aSE @@ -757,3 +757,4 @@ volkmann f'Olkman + diff --git a/dictsource/pt_rules b/dictsource/pt_rules index 399df34a..29ec776e 100755 --- a/dictsource/pt_rules +++ b/dictsource/pt_rules @@ -152,6 +152,9 @@ e (rtA_ E e (rtAm_ E e (rtAs_ E + e (rrA_ E + e (rrAm_ E + e (rrAs_ E e (x_ E e (xA_ E @@ -656,3 +659,4 @@ + diff --git a/phsource/vowel/oo b/phsource/vowel/oo index de7f4976c12709a42c8b36f2b5248479e87e36c4..53744173a052ff660d37a0efeff3de9b13fa000a 100644 GIT binary patch delta 92 zcmcc5`G8X}IKb68B-k~OiGhJ3Kc9smYNLQJBjbn7ag2tHj3*{fU=mdd1xhh69AMbQ nxshoeNF9R)6N9)VlMIl}%uvA0AUgRcv)tyVOahE7P~I~D1`8FF delta 60 zcmV-C0K@;_3Ev42Q&2@iR8vJ!0RR91PXqv6u@OxH0m!po0Wkpqpp%gT6#-h4*#jGs SkO3sK<^m7_kzgW|7zD`q%Mn-r diff --git a/phsource/vowel/uu_2 b/phsource/vowel/uu_2 index 2aa8e64455c516b9eab7b3e5e64068f14841ce24..4cdfe99513ab8c538b31a5cedec63812dafd1144 100644 GIT binary patch delta 22 ecmca$cfoE$IxnN(<_umVRwf3)&2xmd@Bjc=pa$ju delta 22 ecmca$cfoE$IxnNp<_umVR;B|&o975^;Q;_%^arQ_ diff --git a/src/synthdata.cpp b/src/synthdata.cpp index 760eb05c..6e37afed 100755 --- a/src/synthdata.cpp +++ b/src/synthdata.cpp @@ -35,7 +35,7 @@ #include "translate.h" #include "wave.h" -const char *version_string = "1.25.15 01.Jun.07"; +const char *version_string = "1.25.16 02.Jun.07"; const int version_phdata = 0x012514; int option_device_number = -1; diff --git a/src/tr_languages.cpp b/src/tr_languages.cpp index ce75e657..ddcc3dd3 100644 --- a/src/tr_languages.cpp +++ b/src/tr_languages.cpp @@ -454,6 +454,7 @@ Translator *SelectTranslator(const char *name) tr->langopts.stress_flags = 0x6 | 0x10; tr->langopts.numbers = 0xa69 + 0x2000; tr->punct_to_tone[0][3] = 2; // use exclamation intonation + SetLetterVowel(tr,'y'); } break; diff --git a/src/voices.cpp b/src/voices.cpp index b4633fd6..e52a7777 100755 --- a/src/voices.cpp +++ b/src/voices.cpp @@ -52,7 +52,7 @@ int tone_points[10] = {600,170, 1200,135, 2000,110, 3000,110, -1,0}; // limit the rate of change for each formant number //static int formant_rate_22050[9] = {50, 104, 165, 230, 220, 220, 220, 220, 220}; // values for 22kHz sample rate -static int formant_rate_22050[9] = {50, 100, 165, 200, 200, 200, 200, 200, 200}; // values for 22kHz sample rate +static int formant_rate_22050[9] = {50, 100, 160, 200, 200, 200, 200, 200, 200}; // values for 22kHz sample rate int formant_rate[9]; // values adjusted for actual sample rate