From 50136a6da25932e38ea62b405fe252454e638838 Mon Sep 17 00:00:00 2001
From: jonsd <jonsd@d46cf337-b52f-0410-862d-fd96e6ae7743>
Date: Thu, 17 May 2007 11:29:10 +0000
Subject: [PATCH] lang=hr  abbreviations, change phonemes [p] [d]
 dictionary.cpp:  fixed, condition ?3 caused bad 'common' phoneme string

git-svn-id: https://espeak.svn.sourceforge.net/svnroot/espeak/trunk@13 d46cf337-b52f-0410-862d-fd96e6ae7743
---
 dictsource/en_list   |   2 +
 dictsource/en_rules  |   3 +
 dictsource/hr_list   | 159 +++++++++++++++++++++++++++++++++++++++++++
 dictsource/hr_rules  |   2 +-
 phsource/ph_croatian |   2 +-
 phsource/vdiph/ei_2  | Bin 0 -> 6238 bytes
 phsource/vwl_en_us/a | Bin 6237 -> 6237 bytes
 src/dictionary.cpp   |   2 +
 src/synthdata.cpp    |   2 +-
 9 files changed, 169 insertions(+), 3 deletions(-)
 create mode 100644 phsource/vdiph/ei_2

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 0000000000000000000000000000000000000000..197f3696e25d1dc85a3d82bd8d4928fb03eeb76c
GIT binary patch
literal 6238
zcmeI0cUTlx+s0>3o84tuVA-8MyGs>C*<G+#tPy*QEtVM3XiN-ZqDDnYtWnV@8fz>c
zwxD9~9eeLBuSRSHHHsw>Tl9N?wD-I6_xD$vYj+-IcV^BW=l-4he%iKbSifD{hOH6D
zalQI7E*bWJ|Ch+7wj1{M15hX8m9++x9NWrsC1)g=w!q)F(QVWaP30EC(HuU9|C}x2
zx|lewHkyxCnG^YB3&-X0dHe<IY3_VrX&q)uCpCjg>*7nM>wnclTz}L_rkIG*dZ{{5
z+i#5Zw1~JFRW8OTw>9={`N9g5;x5PK#chd8kLwXPF3#%x#T)CN6#p<Gu2Nj(bCoSs
z_E&yU>HCUT<FkB@xaP4bF<DX8h_fEM`+^Z-EYk<-9rPNyT|c9JuDwzFtH%|$GEhD*
zHIr_M3&eDBw75*n7wbw}q$cundABlG9j&G4?Treq2d>F(tEaDLsppvIy5}d)9nS?%
zj;ELBiMzFXoNKNzSD&fPQ#UL3<;wD8>8@BuoZvj|a67&UZ4lZ%^hD@v$9(60u}CVX
zv{wge!}MN8IoDoSxVw?NocpA!qN}&@iQY-8rW#79Tt@049&&bZdYmE7SZ7~nt}{-|
z5)J8F$tr&-Ka)RE3Y6aJ9kr)+MXRsR)-UNruwB%r>0W)M7Nm7jCo5~^gVJg7yz{K%
zROm7Lp^$ySdxLh{b_VXSZV%XI*=pWoS|_Yx*>o52llJ5`8BTfDpY3Bvh!yGyjfGl5
zl)wq+*h2O(tHFZUJ$iy}qFHn*9Y(v;>eNh+k#rJ8cH+kPBpQJFp&axIRl!~G$GA6c
ziOb?5v>gpWK6IO(&e!3uakIJmoS*N*&*b;<kNHT{4b4H9P!O(zd*O6E8BfC*_)DCE
zyTTO{uz@MQhYq8Ks6X<fe0~BS$@}>wd?@-19YY%Ki5KH**hVVD=szLD$tdy_8Aejb
z2c#WoOzM(E(ulMs?~_zAmdqtNWDhw>E|DL|MRJ5}Am5S!@GXrL;zKwKkH>@Y0C<hZ
z|AY798<-<Hi6`|)Q_=!n^+^>{jwpnY2lxbD2zL&~3(#-;3vN9>3aK#a+c<(WC%xgC
z14tk89-LF1lqC|u<Stx)4xAB&FQHK=9IfUn@~J#UW6)F763@jyU<>iWNIH^kqzh>a
zW3EbkB!Rp``jaK3fW*;(bRGSP2D7rv&m!0xx|=4``=kw-j#r|2{5?Js-9rf9Leo)o
z)EDOE3LZ;5bP08`6t;;KFd_sBSjcCa*&r6h4$#i@0htW<>p`*zPkYn-RAle5Oty>t
z$m$eb4@@kUCYQ*j9j#SbkqssL|I31^aI~pu5BI*gm<8{k8QdD4a}=|nFT27$7lt}q
zz=CyVjjw4r99qhPtz7TGX+g!c!}cB7ZOgP4*BsZ(1S}w>b>$Yo0$f^iTuekdDy~0J
zCaR5$FFctM-J_4kTq!rU{G|$K<I=o0yaB!-AN84i3BIYm2!Eb`WBinaP8ENv*t^om
zN|h?5RcxKG*}vVJTH$%QeldknSrJRZOrEo@mqtG$z{u4{=zjfzmaP4#HdN;;kL5=4
zaw$yOCJquii9N+ku|Vu0y_UAfnaX%|ik78sF%G%*xwAZ7!fu5ngeQfU2|pLsF)Y`k
zdp>pVa4}a?W1@aUGifc=EXAax$#105l1UmPzH|<77CDwUrZ{pPwVZ{{ed2OynmknL
zrq<9x^dI!8MyzYT>$<DJwcb_VHQzX?-_Y{a`^p=+tUM6dG*qlEMu_p^2jVKxDt#{9
zmfFgD<XB~<LexR(eKlFTs<qO$=z&I(@uAVvs9_Z9BlSWpQ5&RYD)Zz_DNXF|tm#lf
zUxwrbp9(r?I}~`vdNbg;CDamUZer>qWUv#oEp0*<P>E%*N34eMsW4H<6uyRi6G0Px
zVry9%Yr&$KiTy$g=uLW!UZjWUYC4{_p%%KD)FGQd8P(7!?kqnK88{U$#k=rsyb4bQ
zDn#J|^gU3*j}Q>yDm=LqMWDK<GfG7h&@yxsJ%OjUK4@hq=x`z)i@(5qaeG`3`+x-j
z_&K_X4xuGz7(8nXZRgYZg*-ti=pu^8qd}Jep!knT2B>BO*$&%AvVtriGsqNp+B3;_
zWEBwL0=Y-tkYMVjvD8oF;a#Vg-XL4Z*Q67PC6wI5S3#3E@MBDX4)G)j2=W;j16P<w
z7Qyx%RHMnKz!)Fl$w3&Sgug|1_#*ByC{e{}ct3uMgNO>79j^Bb*l-r_#LMwi;7ey*
z4cqY@v<7{O3}AtkkLG{ilhFlK5s$+A@H1R|&ziu1G9-Z9!Q1h4xZ)_h60X^lWD|jQ
zrOW6oYGaYW0uwt+N5ISvBD-O3BT*Z48O7qdSi>8UfC~5r=n7sy8UnYgvaxI{JI5}v
zgKQ~qpfbBlGiWs3Mmm!)VEFrF6U<64x|TknWmyL{oXuu+o?qt{mJ)zvqA8^nom8^_
zZx$e~d&$v1SWp*z`zH&!vGsqlV5|8T?hh86x32k<1s~gz{>FkPe`7&Y(?7A`q;gH|
zW%Tp(hzN=96Vs#Io7j3462KKy^Y--i@%Hfc_GWl*dVBc-{YU)c<EtbbNYE-qRXm*#
zoRH_Q=c^z0B6eiiU!zAv)(CIzIpF%<xTmM+Zaq(1sI}F8QAeu3DxH)yGLkz<yTqE}
zHRlrN9Oq7_O`IquNK}3$hp36#m-<n|?r!P%ENpOi(}?_t#K?Ceqars)I3kk5lfwph
z2D^v5zA`3&Cs?JPRRWav<Xou+T(6;c*qP)!;~3ybbhLG>akO-*;%o7?bW~oZ3{x9x
zf%*~sbHnT!>e}f#=33yY?#eQ5>lQsyOH}(POJz<TEZL+3;#~0?aglgLWKt_>vGkkN
zS>7hQm9Lc-N(#`RkCvyk(6jYNx?+SIX5)nZss2Q3ugzCaDh2W*>7IDmxyP|Mbi6$!
zq-${NpyswVf!(YF0>)di%(<ol!6T$GgV|YAmc`z%X25`T!a?DPutQiR3>R7oF5zdk
z6V{A@tSf5`OlZm4z`ij{V8QGv{g&3IXJPH#1}k_pO5_<@i6q<!4+l*T#ocg4jPNlu
z6?H<<=nbFGU*`+>7rYg@kr&lL?LgBr&|dTqiMR@G4(D~kt#Bfa#i95$%17tmv$bde
zFrz<8LNdC@59fpV8vFr15$<EfJ%BfbxD2?0VPqCrNw$LSb79*{_QA@3f!rZ4NeC@V
z>(UPNBRZ6hp%dvOIu5E{G>JyhSL6g)NCv_AbxAeQViM^}29il+F)-y6xj`P0R|HW?
z5qz_dTqXPAli~0!3)v3(zJVH}sr*vDEoiYCXg3>FeF_M08Xv`b@ESZD55w=4c%waN
zERYPL4SWawC0B`G&AZT7=o<3kA$T*sj~yirq!FnF`sB$OJQKGAx?VxY(QDKZAH?y%
zw)@0O-v>W70><v6*T_fY5{?6JvKU-dKX4awz=;*18fX+h3uWRigrlQ?+&<O~{^wFz
zckp#)c9f>Uug)difjD{iA&w!RlLN#?Tf&@dp?MTBoz;1DKE71=iGQ(xJo*O~a9rn-
zqg%NRri<VUidis=zieL!zMz-|y6L99IrxHN7L2!?w->MN#Vkk(JYg%Yi&?PEwkM!;
z{cmFWMBnkd7bs@Ig%U4Ne1n*X{w4LlEcllN|FYo!mjyRHJ4!STED&-^tAF$brTqeq
zo5yi%KDx)(LG!t)d{tW?(0NBTgIj4zw_34|_L}c=TLQR}T##?w%gqYhQlkIawgSA=
zmSQSpK}G|QzWh)94{=5RUS~9ji72hZEzF)LtF9K|d!lB<+$guHd{|t0?`>~8-&o&7
z-#}k;U#!pR3-Lwxn!?{VeU1D}{RRHV{%k+-zxK|I%P-HzqOz<^Ow@=7G5o0~$kW+<
zz?JCQWmGYi!W!IDTd%%W>MN7v|45ajMPihA%sJON-+9&9Q4EGPSXMfy>$EUqu1oez
z2)h;Th_puSigHKCM&FKV6ZKW(n27%2O~T4}0^F~RBAx0{+IwoY5~5_tiku@gmh#0Z
zVsp_iCW&)Iw{%1rD>qbLDGSs%ZG|T5X?mVs*H~aYGRnJ>T=iTISFX|4IHlLtmun$f
zn)*ojM0qA>K=<K^v`<<gEt9rNKT4r;2YIRdT5hkbS8VEs>P|Hfe83Fti1tw9bxyyl
zZPik=0Bw@`M5(I`mzPL;p=WT*Q5gElZnDcE<%1grCEGFr4_NKiw1B{XT+3|Bc*_{e
zILidfM0iiPd}c|uw6s*V$d+g3Gv;jbD04S+Epvo9$c)XunO>P*n4XyKn2wv4ng*CE
zn63&V1X1{&RfTmYnFi2(;MjYUCXjetu>QQjcfoxhhs>}Jvcp`QiKjqUU@l&PbMcS(
zEe?Y$o=ir<%C{KY@N#hDlfa#KgtV=ZH~1E;vFq`CNDry_JxCJev4U+l2+~6p+!2p}
ze!&s^GvtIASlK&5&mf&lgX?T2N69r<)e*H*4=qot(gw6ObU6BhBNz?YW-J{}`$57<
zpuzMZIZd{aHDn#x1yw$I4X!yHl0<FV6x>8lno7T<)1XJPj_#y;=vGMKU%@&WKsP~N
z{|S72GjKo4F%Ris7C8>?fzlA_q@mPG-;ld-WEnV#7BCYJ@D4l<x5g^I3%TeBx`k}G
zI({F#!#F$!4}uO!ZS2MbKSck5OtczhKrcl_8zD`6zz3tbNC1y98fGpHW+4x?MA`gH
zejTcdm*G43B_xtXFe4YiBOJvUq$=G<z2Nv)LhmP+<*=_=XGj+hVDyvdhqM{|wmOgt
z2Se`o4-I0q*@tW*%Z40rjXefm@Q6G5I}4_r`MIR}>+QdLho!#Y4;Iu$i#gx#ENH|=
z0t>i+Vis&O|60s~z+%n6vAzHnaF*iw8(RvnfD=ktz;XY~f?{7#%7UHRCf(`&HSBO?
z>oUX2Hi%tY{&<Cjah1F?yobHlytllCUc0ZOZ@;g(|0jQXypZrw!pwxUgn)#q@tnVp
zcW8wsv4t_?q7x#W;mthvUB4QgjOY4BeK2$je$Z02*Xl5}NJ&+m%0nP0OqNt>nOIBw
z*?Gz-h^xgDQVYedz0~i!&UzMvH;UXI^)&isne>?bG1)PdV)~VNHyTBajJOhJc-pwW
z)Yqy7a=bL#S<X>te-aWOvN||9xLxq*;Ag?hLnhcKh0b%VbZ!uHq&e~s<sH?m?bN#I
z`FaauqA?wE{!_i7-d$^^YD%7zBhGT>IEq43L!F@)?JMjV_F?uR_OI>h>_zqtp(jJ%
zb>usSIs?Voq9#oPUUia}%Xei%X`plicBCpFD_x<EP>P_lkS14<PfFdSYhp7o+xgN_
z!;um?+rBmARPgnnd$uQmFRa)a5>UqSj(L!2vtSd_!TIk7C!I<MfNGY}^OS+cd$CDu
z1w2=m+0W2dG=!Q$cVV=UEu0b_3qhtbrs}3fre>xlrn;thliOr66$%%HUBdUmOkuo`
zCJYq%2_FcZg;qiXp{h_$&;_gTn%!qt*dex_&1d7FU)h#bVH)Eh&t9MhL3NwyM%Xrh
z0&`##-$A!>4E+MM+y@+TUl`j6`VFXZ2R%pc(%-0+Ihn#FW@Cswp*QGRdYB%d$LJOM
z2tKO-xn=<S2A=j^>=-)*ubpfO8^gN5Cq>YQ8x5)#X#qJ1Jjj6_!U^ctQ5psWX+k>!
z4f?~~rqlJHn*de^9CsEw&hD{Skf@%*jO0KLk7suvEj6byeGAz>8Yq)avmvkN(<1s7
z`mr2)3;sKRsc^>zpv(Sj1e?I7vgwe$ra(0cbUTpsh5lV*7Rv}b1N3P^U&DBYkPf63
zc=|7(Z?T{JLSjM7OQ3V0v1Z`>Cqq{^hi!vjbd$YhE};g@aTlSh&>lKHH3hFwMhF+&
tf+_?FMeGcl%ie{NETC1O<J+A)hYZsgx)=iVWrjnyu{xPUo{{GCe*v1Vmc#%6

literal 0
HcmV?d00001

diff --git a/phsource/vwl_en_us/a b/phsource/vwl_en_us/a
index b903e0a97eb605332cba73dc7328fc7f81087466..dfb450af211a605272be44154f2b2b1b2b191051 100644
GIT binary patch
delta 101
zcmca>aMxf%HjB&$Rt9k%CL1O%P8r4kE(Sp>CKsmDJPgc-c^UXNx3hd;hO2Pr{KEiK
rahK;e6IjJ$jz7$d8k;BZ{AcF<!1_wagJ}v=D5nJDo6U0s4zdFP63H8s

delta 101
zcmca>aMxf%Hj4}k8-sWY(-tN#P8r4~E(Sg;CKsmDJPgc-c^P;&x3hd;hO2Pr{KEiK
rahK;e6IjJ$jz7$dHk&8#{AcF9&-zNpgJ}v=D5nJDjm>ie4zdFPBiS42

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;