diff --git a/dictsource/dict_phonemes b/dictsource/dict_phonemes index 2707fcef..b13d4576 100644 --- a/dictsource/dict_phonemes +++ b/dictsource/dict_phonemes @@ -66,7 +66,7 @@ R3 s S t T tS v w x Z -Dictionary hu_dict 2012-04-07 +Dictionary hu_dict 2012-05-04 a A a: e E e: i i: o o: u u: Y y y: Y: @@ -152,7 +152,7 @@ l m n N p r R s S s2 t v w Z -Dictionary fr_dict 2012-02-22 +Dictionary fr_dict 2012-05-04 @ @- a a- A~ e E e- E: E~ i I o O O~ u @@ -187,7 +187,7 @@ N n^ p r R R2 s S t tS ts tS; v x z Z -Dictionary hi_dict 2011-05-09 +Dictionary hi_dict 2012-04-12 @ @2 a a: aI aU e E e: E: E~ i I i: l- o @@ -202,7 +202,7 @@ q r r. s S s. t T t. th th. v w x z -Dictionary ta_dict 2012-04-07 +Dictionary ta_dict 2012-04-12 a a: aI aU e E e: i I i: o o: u U u2 u: @@ -375,7 +375,7 @@ S s; S; t t; tS ts tS; ts; v w x z Z Z; -Dictionary pt_dict 2010-09-04 +Dictionary pt_dict 2012-05-04 & &/ &U~ &~ @ @- a A aI aU e E eI EI eU EU @@ -565,18 +565,18 @@ s S s. t T t. th v w x z z. -Dictionary pa_dict 2012-04-07 +Dictionary pa_dict 2012-05-04 -@ a a~ e E e~ E~ i -I i~ I~ o O O~ o~ r- -u U U~ u~ V V~ +@ a a~ e E eI e~ E~ +i I i: i~ I~ o O O~ +o~ r- u U U~ u~ V V~ : ; b bh c ch d d. -dh dh. f g gh h H j -J Jh k kh l l. m n -N n. n^ p ph Q R R2 -s S t t. th th. v x -z +dh dh. dZ f g gh h H +j J Jh k kh l l. m +n N n. n^ p ph Q r +R R2 s S t t. th th. +v w x z Dictionary prs_dict 2009-12-01 diff --git a/dictsource/fr_list b/dictsource/fr_list index 30848607..329e22a9 100755 --- a/dictsource/fr_list +++ b/dictsource/fr_list @@ -24,7 +24,7 @@ // 2006-11-18 Gilles Casse // -// Updated 2012-02-12 Michel Such +// Updated 2012-04-15 Michel Such // // * Numbers, a few abbreviations and exceptions. // @@ -683,6 +683,7 @@ bissus bisys blues _^_en blum blum bootable boutable $text +brian _^_en broglie breuil $text browglie breuil $text buffer bYfWr @@ -696,6 +697,7 @@ charles Sarl (chef d'oeuvres) chédeuvres $text chienlit SjA~li choeur kWr +cindy sindi cinema sinema cocus kOky couscous kuskus @@ -712,6 +714,7 @@ faut fot2 $u+ feldspath fEldspat fier fjer $verb for $u+ +francesco frA~nSEsko francis frA~sis fred frEd free _^_en @@ -737,6 +740,7 @@ island _^_en jackpot dZakpOt jacques Zak james _^_en +jennifer ZenifEr karaoke karaoke kevin kevin laetitia letisja @@ -759,6 +763,7 @@ mouloud mulud monsieur m@sjY mrs _^_en oasis oazis +oliver _^_en ours urs output _^_en pataquès patakEs diff --git a/dictsource/hu_list b/dictsource/hu_list index b330755a..c1d968bc 100755 --- a/dictsource/hu_list +++ b/dictsource/hu_list @@ -3359,7 +3359,6 @@ hangjelzés $unstressend (korrigálás révén) koR2R2iga:la:S_||R2e:ve:n $unstressend (épületekhez hasonlította) e:pylEtEkhEz_||hAsonli:tot:A $unstressend (problémájához hasonlította) pR2oble:ma:ja:hoz_||hASonli:tot:A $unstressend -(az akadálymentesítés) Az_||AkAda:jmEntESi:te:S $unstressend (volna meg őket) volnA_||mEg_||Y:kEt $unstressend (értelme felróni) e:R2tElmE_||fElR2o:ni $unstressend (is született) iS_||sylEtEt: $unstressend @@ -5110,6 +5109,31 @@ döntését $unstressend (eső részét) ESY:_||R2e:se:t $unstressend végéig $unstressend (meg kell vizsgálni) mEg_||kEl:_||viZga:lni $unstressend +(döntött arról) dYntYt:_||AR2R2o:l $unstressend +posztról $unstressend +(elnöki posztról) ElnYki_||postR2o:l $unstressend +(élte meg) e:ltE_||mEg $unstressend +érezhette $unstressend +népszerű $unstressend +(is alátámasztotta) iS_||Ala:ta:mAstot:A $unstressend +(három évig bírni) ha:R2om_||e:vig_||bi:R2ni $unstressend +(nap után született meg) nAp_||uta:n_||sylEtEt:_||mEg $unstressend +(szokta meg) soktA_||mEg $unstressend +rendelt $unstressend +(nap alatt tudatosult) nAp_||AlAt:_||tudAtoSult $unstressend +győzni $unstressend +garantálni $unstressend +(tette világossá) tEt:E_||vila:goS:a: $unstressend +(szóló döntés) so:lo:_||dYnte:S $unstressend +sejtik $unstressend +hamarabb $unstressend +erősíti $unstressend +lemondani $unstressend +(volna magát) volnA_||mAga:t $unstressend +(sem került) SEm_||kER2ylt $unstressend +hallgatták $unstressend +(hogyan fog végződni) hoJAn_||fog_||ve:gzY:dni $unstressend +akadálymentesítés // word pairs (mit eszel) mit_||EsEl $unstressend diff --git a/dictsource/hu_rules b/dictsource/hu_rules index c5a24b80..6e1f8046 100644 --- a/dictsource/hu_rules +++ b/dictsource/hu_rules @@ -1638,6 +1638,9 @@ _kemene) ssz Ss _szamo) ssz Ss _szilvá) ssz Ss _vámo) ssz Ss +keresé) ssz Ss + cipő) ssz Ss +szorongá) ssz Ss .group sz sz s diff --git a/dictsource/pt_list b/dictsource/pt_list index 40905f6b..23f20898 100755 --- a/dictsource/pt_list +++ b/dictsource/pt_list @@ -44,20 +44,19 @@ _tld tS'iU // character names -_á $accent -_à $accent -_à $accent -_â $accent -_ã $accent +á $accent +_à $accent // à can be a word +â $accent +ã $accent ç $accent -_é $accent -_ê $accent -_í $accent -_ó $accent -_ô $accent -_õ $accent -_ú $accent -_ü $accent +_é $accent // é can be a word +ê $accent +í $accent +ó $accent +ô $accent +õ $accent +ú $accent +ü $accent ß _^_DE v ve // not Roman numbers @@ -204,6 +203,43 @@ _dpt _v'irgul& // _0Z2 seNt'Ezim& // 100ths // _0Z3 mil'Ezim& // 1000ths +// ordinal numbers +_#º U +_#ª & +_ord o + +_1o pRim'eI* +_2o seg'u~Nd +_3o te*@-s'eI* +_4o kw'a*@-t +_5o k'iNt +_6o s'est +_7o s'EtSim +_8o oIt'av +_9o n'on +_10o d'Esim +_2Xo viZ'Ezim +_3Xo tRiZ'Ezim +_4Xo kwad*aZ'Ezim +_5Xo kiNkwaZ'Ezim +_6Xo seksaZ'Ezim +_7Xo septwaZ'Ezim +_8Xo oktoZ'Ezim +_9Xo nonaZ'Ezim +_0Co seINt'Ezim +_1Co seINt'Ezim +_2Co duseINt'Ezim +_3Co tRiseINt'Ezim +_4Co kwad*iZeINt'Ezim +_5Co kiNZeINt'Ezim +_6Co seIseINt'Ezim +_7Co septSiZeINt'Ezim +_8Co oktSiZeINt'Ezim +_9Co noNZeINt'Ezim +_0M1o mil'Ezim +_1M1o mil'Ezim + + // not roman numbers vi vi @@ -363,6 +399,7 @@ pelos $u ao $u à ,a: +à $atend $accent aos $u às ,a:s @@ -444,6 +481,7 @@ se $u // if ser $u sou $u é E $u +é $atend $accent és Es $u somos $u sois $u diff --git a/phsource/compile_report b/phsource/compile_report index 72e00529..75f74835 100644 --- a/phsource/compile_report +++ b/phsource/compile_report @@ -5,7 +5,7 @@ consonants 10 116 base2 26 123 en 53 153 en-n 33 153 - en-us 40 154 + en-us 41 154 en-sc 40 155 en-rp 34 153 en-wm 31 153 @@ -61,7 +61,7 @@ consonants 10 116 ka 19 112 rw 15 130 ne 18 156 - pa 14 149 + pa 15 150 prs 8 111 sl 10 135 gd 6 107 @@ -402,7 +402,7 @@ l/l_ [l] base [l/] fr l/l_@ [l/3] base [l/] fr -l/l@ [hVv] base +l/l@ [hv] base [l#] base [l] fr [l/2] fr @@ -436,7 +436,7 @@ l/L2_oL [l/2] base l/L2_uL [l/2] base l/l_3 [l/] de l/l_4 [ll] sq -l/la [hVv] base +l/la [hv] base [l#] base [l] fr [l/2] fr @@ -444,7 +444,7 @@ l/la [hVv] base [K] tn l/l_a [l/3] base [l/] fr -l/le [hVv] base +l/le [hv] base [l#] base [l] fr [l/2] fr @@ -456,7 +456,7 @@ l/L_eL_af [&] af [&:] af l/l_front [L] sq l/l_front_ [l/4] sq -l/li [hVv] base +l/li [hv] base [l#] base [l] fr [l/2] fr @@ -470,7 +470,7 @@ ll/ll [L] bg ll/_ll [L] bg l/l_long [l] base [l] fr -l/lo [hVv] base +l/lo [hv] base [l#] base [l/2] fr [K] nso @@ -480,7 +480,7 @@ l/l_o [l/3] base l^/l_rfx [l.] base [l] ru [l^] ru -l/lu [hVv] base +l/lu [hv] base [l#] base [l] fr [l/2] fr diff --git a/phsource/ph_english b/phsource/ph_english index 2c928ca8..088a6e57 100644 --- a/phsource/ph_english +++ b/phsource/ph_english @@ -1,6 +1,7 @@ phoneme t2 // [t] which doesn't reduce - import_phoneme base/t + vcd alv stop + ChangePhoneme(t) endphoneme diff --git a/phsource/ph_english_us b/phsource/ph_english_us index be1425eb..edf8229f 100644 --- a/phsource/ph_english_us +++ b/phsource/ph_english_us @@ -388,3 +388,7 @@ phoneme t WAV(ustop/t, 90) endphoneme + +phoneme t2 // [t] which doesn't reduce + import_phoneme base/t +endphoneme diff --git a/phsource/vowel/a_8 b/phsource/vowel/a_8 new file mode 100755 index 00000000..1974c863 Binary files /dev/null and b/phsource/vowel/a_8 differ diff --git a/phsource/vowel/ii_8 b/phsource/vowel/ii_8 new file mode 100644 index 00000000..6218e30e Binary files /dev/null and b/phsource/vowel/ii_8 differ diff --git a/phsource/vowel/u_bck3 b/phsource/vowel/u_bck3 new file mode 100644 index 00000000..05819c41 Binary files /dev/null and b/phsource/vowel/u_bck3 differ diff --git a/phsource/vowel/y#_4 b/phsource/vowel/y#_4 new file mode 100644 index 00000000..ca32bcb5 Binary files /dev/null and b/phsource/vowel/y#_4 differ diff --git a/src/numbers.cpp b/src/numbers.cpp index 65c07bcd..72df2df3 100644 --- a/src/numbers.cpp +++ b/src/numbers.cpp @@ -1503,17 +1503,24 @@ static int LookupNum3(Translator *tr, int value, char *ph_out, int suppress_null ph_hundred_and[0] = 0; if(tensunits > 0) { - if((value > 100) || ((control & 1) && (thousandplex==0))) + if((control & 2) && (tr->langopts.numbers2 & NUM2_MULTIPLE_ORDINAL)) { - if((tr->langopts.numbers & NUM_HUNDRED_AND) || ((tr->langopts.numbers & NUM_HUNDRED_AND_DIGIT) && (tensunits < 10))) + // Don't use "and" if we apply ordinal to both hundreds and units + } + else + { + if((value > 100) || ((control & 1) && (thousandplex==0))) + { + if((tr->langopts.numbers & NUM_HUNDRED_AND) || ((tr->langopts.numbers & NUM_HUNDRED_AND_DIGIT) && (tensunits < 10))) + { + Lookup(tr, "_0and", ph_hundred_and); + } + } + if((tr->langopts.numbers & NUM_THOUSAND_AND) && (hundreds == 0) && ((control & 1) || (ph_thousands[0] != 0))) { Lookup(tr, "_0and", ph_hundred_and); } } - if((tr->langopts.numbers & NUM_THOUSAND_AND) && (hundreds == 0) && ((control & 1) || (ph_thousands[0] != 0))) - { - Lookup(tr, "_0and", ph_hundred_and); - } } diff --git a/src/synthdata.cpp b/src/synthdata.cpp index e7b1a543..e4766485 100644 --- a/src/synthdata.cpp +++ b/src/synthdata.cpp @@ -35,7 +35,7 @@ #include "translate.h" #include "wave.h" -const char *version_string = "1.46.14 22.Feb.12"; +const char *version_string = "1.46.17 05.May.12"; const int version_phdata = 0x014600; int option_device_number = -1; diff --git a/src/tr_languages.cpp b/src/tr_languages.cpp index 81d8665d..01c4cfc1 100644 --- a/src/tr_languages.cpp +++ b/src/tr_languages.cpp @@ -1076,6 +1076,7 @@ SetLengthMods(tr,3); // all equal tr->langopts.stress_rule = STRESSPOSN_1R; // stress on final syllable tr->langopts.stress_flags = 0x6 | 0x10 | 0x2000 | 0x20000; tr->langopts.numbers = NUM_DECIMAL_COMMA | NUM_DFRACTION_2 | NUM_HUNDRED_AND | NUM_AND_UNITS | NUM_ROMAN; + tr->langopts.numbers2 = NUM2_MULTIPLE_ORDINAL; SetLetterVowel(tr,'y'); ResetLetterBits(tr,0x2); SetLetterBits(tr,1,"bcdfgjkmnpqstvxz"); // B hard consonants, excluding h,l,r,w,y