diff --git a/dictsource/en_list b/dictsource/en_list index 41c3c751..e70398d4 100644 --- a/dictsource/en_list +++ b/dictsource/en_list @@ -515,7 +515,9 @@ cajole ka2dZoUl caldera k0ld'e@r@ calix keIlIks calv kA:v // for calved, calving +?3 calv kav // for calved, calving calve kA:v +?3 calve kav cameo kamIoU campus kamp@s // campuses canal k@nal diff --git a/dictsource/en_rules b/dictsource/en_rules index 29311729..cc8d1d64 100644 --- a/dictsource/en_rules +++ b/dictsource/en_rules @@ -533,7 +533,9 @@ _c) al (e al _sc) al (A eIl c) al (f A: +?3 c) al (f a h) al (f A: +?3 h) al (f a s) al (f 0l @) algia (_ 'aldZ@ g) al (i_ 'A:l @@ -587,6 +589,7 @@ s) al (ut @l s) al (uta al h) al (v A: +?3 h) al (v a m) al (no %al .group am diff --git a/dictsource/hr_list b/dictsource/hr_list index c5f1b2d7..e6406a23 100644 --- a/dictsource/hr_list +++ b/dictsource/hr_list @@ -52,6 +52,33 @@ _?A slovo // unknown letter µ mikro ¶ tSlan&k ° st'up&n^ +_" n'avodnIk +_‚ 'otvo*,En@||n'avodnIk +_„ sp'utSEn@||n'avodnIk +… t@-*'i_||t'otSke +† k@-*'iZ +‡ dv'ost@-*'uk@||k@-*'iZ +‰ p@-*'omil +_‹ 'otvo*,En@||n'avodnIk +_‘ 'otvo*,En@||n'avodnIk +_’ jedn'ost@-*'uk@||n'avodnIk +_“ 'otvo*,En@||n'avodnIk +_” zatvo*,En@||n'avodnIk +• k@-*'upna||t'otSk@ +_– en||ts'r-t& +_— em||ts'r-t& +™ p@-*'oizv'odZatS +˘ b@-*,EvIs +¨ p@-*Ijegl&s +_« 'otvo*,En@||n'avodnIk +_­ p@-*Ivr,Emen&||tsr-tIts& +· p'ut& +¸ s,EdIl& +_» z'atvo*,En@||n'avodnIk +® r,Egist@-*'atsIj& +ł l@||s&||tsr-tItsom +× p'ut& +÷ p'od'ijeljen'o _$ dol&r _- minus @@ -128,6 +155,136 @@ _0M4 b'ilijUna _1M4 b'ilijUn _dpt _:z'a*Ez_ +// Roman numerals +ii $abbrev +iii $abbrev +iv $abbrev +vii $abbrev +viii $abbrev +ix $abbrev +xi $abbrev +xii $abbrev +xiii $abbrev +xiv $abbrev +xvi $abbrev +xvii $abbrev +xviii $abbrev +xix $abbrev +xxi $abbrev +xxii $abbrev +xxiii $abbrev +xxiv $abbrev +xxvi $abbrev +xxvii $abbrev +xxviii $abbrev +xxix $abbrev +xxxi $abbrev +xxxii $abbrev +xxxiii $abbrev +xxxiv $abbrev +xxxvi $abbrev +xxxvii $abbrev +xxxviii $abbrev +xxxix $abbrev + +// Abbreviations +ab $only $abbrev +abc $abbrev +abs $abbrev +agm $abbrev +amd $only $abbrev +amg $only $abbrev +arg $only $abbrev +atp $abbrev +avg $abbrev +brf $abbrev +brl $abbrev +brx $abbrev +cca $abbrev +cdr $abbrev +cdrw $abbrev +clr $abbrev +cr $only $abbrev +ctrl $abbrev +doo $abbrev +ecdl $only $abbrev +esc $only $abbrev +eu $only $abbrev +eur $only $abbrev +faq $abbrev +fbi $abbrev +fr $only $abbrev +frm $abbrev +frx $abbrev +gr $only $abbrev +grr $abbrev +grrr $abbrev +grp $abbrev +grps $abbrev +hho $abbrev +hr $only $abbrev +hrk $only $abbrev +hrt $only $abbrev +hrv $only $abbrev +hzzo $abbrev +ibm $abbrev +jrr $abbrev +nr $only $abbrev +nrg $abbrev +nvda $abbrev +oem $abbrev +off $only $abbrev +omw $abbrev +pr $only $abbrev +prn $abbrev +raw $only $abbrev +rb $abbrev +rba $abbrev +rc $only $abbrev +rcc $abbrev +rcd $abbrev +rcs $abbrev +rd $only $abbrev +rds $abbrev +rgb $abbrev +rh $only $abbrev +rk $only $abbrev +rn $abbrev +rm $only $abbrev +rmx $abbrev +rp $only $abbrev +rs $abbrev +rss $abbrev +rta $abbrev +rtf $abbrev +rtl $abbrev +rttl $abbrev +rtv $abbrev +rx $abbrev +rw $abbrev +scr $only $abbrev +sr $only $abbrev +srd $only $abbrev +udt $abbrev +url $only $abbrev +vba $only $abbrev +vbr $abbrev +vga $abbrev +wbr $abbrev +xy $abbrev + +dr $dot $abbrev +mr $dot $abbrev +mrs $dot $abbrev +itd $dot $abbrev +npr $dot $abbrev +str $only $dot $abbrev + +inc $dot +prof $dot +sl $dot +tj $dot +tzv $dot // Demonstratives tko $u+ @@ -205,4 +362,6 @@ u u $atend // Exceptions +utf u||te||ef + diff --git a/dictsource/hr_rules b/dictsource/hr_rules index 3b3f3d71..9f0cd497 100644 --- a/dictsource/hr_rules +++ b/dictsource/hr_rules @@ -81,7 +81,7 @@ .group r r R - A) r (A * + A) r (A R K) r (A @-* rr R r (_ R diff --git a/phsource/ph_croatian b/phsource/ph_croatian index bb7c6abf..de139454 100644 --- a/phsource/ph_croatian +++ b/phsource/ph_croatian @@ -151,7 +151,7 @@ phoneme d vowelout f1=2 f2=1700 -300 300 f3=-100 80 formants d/d+x/d%50 before _ d/d_+x/d_ - before r d/dr+x/d + before r d/dr+x/d%50 after _ NULL after @ d/xd lengthmod 5 diff --git a/phsource/vdiph/ei_2 b/phsource/vdiph/ei_2 new file mode 100644 index 00000000..197f3696 Binary files /dev/null and b/phsource/vdiph/ei_2 differ diff --git a/phsource/vwl_en_us/a b/phsource/vwl_en_us/a index b903e0a9..dfb450af 100644 Binary files a/phsource/vwl_en_us/a and b/phsource/vwl_en_us/a differ diff --git a/src/dictionary.cpp b/src/dictionary.cpp index 8c7d7408..7703b53b 100755 --- a/src/dictionary.cpp +++ b/src/dictionary.cpp @@ -1645,6 +1645,8 @@ void Translator::MatchRule(char *word[], const char *group, char *rule, MatchRec if(common_phonemes != NULL) { match.phonemes = common_phonemes; + if(*match.phonemes == RULE_CONDITION) + match.phonemes += 2; // skip over condition number while(((rb = *match.phonemes++) != 0) && (rb != RULE_PHONEMES)); } else diff --git a/src/synthdata.cpp b/src/synthdata.cpp index a6df6101..c55e0dd0 100755 --- a/src/synthdata.cpp +++ b/src/synthdata.cpp @@ -35,7 +35,7 @@ #include "translate.h" #include "wave.h" -const char *version_string = "1.24.10 14.May.07"; +const char *version_string = "1.24.11 17.May.07"; const int version_phdata = 0x012201; int option_device_number = -1;