Merge branch 'master' of https://github.com/gude432/espeak

dictsource/om_list

@@ -1,39 +1,91 @@
 // numeric
-_0 	duw:a:
-_1 	tok:o
-_2 	l@m@:
-_3 	s@di:
-_4 	afur
-_5 	S'an
-_6 	dZ'a:ha
-_7 	To:rba
-_8 	sed:e:t
-_9 	s@g@l
-_10 	kud'@n
-_1X 	kud'@
-_20 	dig'dam@
+_0 	    duw:a:
+_1 	    tok:o
+_2 	    lama
+_3 	    sadi:
+_4 	    afur
+_5 	    S'an
+_6 	    dZ'a:ha
+_7 	    To:rba
+_8  	sad:e:t
+_9 	    sagal
+_10 	kud'an
+_1X 	kud'a
+_20 	dig'dama
 _2X 	dig'dami:
 _3X 	sod:omi:
-_4X 	afurt@mi:
-_5X 	S@nt@mi:
-_6X 	dZat@mi:
-_7X 	torbat:@mi:
-_8X 	s@de:t:@mi:
-_9X 	s@gal't:ami:
+_4X 	afurtami:
+_5X 	Santami:
+_6X 	dZatami:x
+_7X 	torbat:ami:
+_8X 	sade:t:ami:
+_9X 	sagal't:ami:
 _0C 	ib:'a
 _1C 	ib:'atokko
 _2C 	ib:'alama
-_3C 	ib:'as@di
+_3C 	ib:'asadi
 _4C 	ib:'a:furi
-_5C 	ib:'a:S@ni
+_5C 	ib:'a:Sani
 _6C 	ib:'adZa
-_7C 	ib:'atorb@
-_8C 	ib:'as@de:ti:
-_9C 	ib:'as@g@li
-_0M1 	kum@:
+_7C 	ib:'atorba
+_8C 	ib:'asade:ti:
+_9C 	ib:'asagali
+_0M1 	kuma
 _0M2 	milijoni:
 _0M3 	bilijoni:
 _dpt 	tuqa:
-_. 	tuqa:
+_. 	    tuqa:
 _roman	roma:ni:
-?!3 _0and fi
+?!3     _0and fi
+
+
+a	a:
+b	ba:
+c	tS`a:
+d	da:
+e	e:
+f	fa:
+g	ga:
+h	ha:
+i	i:
+j	ja:
+k	ka:
+l	la:
+m	ma:
+n	na
+o	o:
+p	pa:
+q	k`a:
+r	ra:
+s	sa:
+t	ta:
+u	u:
+v	va:
+w	wa:
+x	t`a:
+y	ya:
+z	za:
+ch  tSa:
+dh  Da:
+ny  n^a:
+ph  Pa:
+sh  Sa:
+zy  Za:
+ts  tsa:
+
+_.	xuqaa
+_!	
+_?	mal:ato:ga:f:i:
+_$	dollari:
+_%	parsanti
+_&	fi
+€	yuuroo
+%	parsanti
+_<	nixiqata
+_>	nica:la
+_-	hir'isu
++	ida'u:	
+*	astariiksii	
+=	qixedha	
+£	pawundi
+µ   ma:ykro

dictsource/om_rules

@@ -1,89 +1,120 @@
 // Oromo translation rules
 
 .group a
-          a          a
-          aa         a:
+        a          a
+        aa         a:
+
 .group b
-          b          b
-          bb         b:
+        b          b
+        bb         b:
+
 .group c
-          c          tS`
+        c          tS`
+
 .group d
-          d          d
-          dd         d:
+        d          d
+        dd         d:
+
 .group e
-          e          e
-          ee         e:
+        e          e
+        ee         e:
+
 .group f
-          f          f
+        f          f
+
 .group g
-          g          g
-          gg         g:
+        g          g
+        gg         g:
+
 .group h
-          h          h
+        h          h
+
 .group i
-          i          i
-          ii         i:
+        i          i
+        ii         i:
+
 .group j
-          j          dZ
+        j          dZ
+
 .group k
-          k          k
-          kk         k:
+        k          k
+        kk         k:
+
 .group l
-          l          l
-          ll         l:
+        l          l
+        ll         l:
+
 .group m
-          m          m
-          mm         m:
+        m          m
+        mm         m:
+
 .group n
-          n          n
-          nn         n:
+        n          n
+        nn         n:
+
 .group o
-          o          o
-          oo         o:
+        o          o
+        oo         o:
+
 .group p
-          p          p
-          pp         p:
+        p          p
+        pp         p:
+
 .group q
-          q          k`
-          qq         k`:
+        q          k`
+        qq         k`:
+
 .group r
-          r          r
-          rr         r:
+        r          r
+        rr         r:
+
 .group s
-          s          s
-          ss         s:
+        s          s
+        ss         s:
+
 .group t
-          t          t
-          tt         t:
+        t          t
+        tt         t:
+
 .group u
-          u          u
-          uu         u:
+        u          u
+        uu         u:
+
 .group v
-          v          v
+        v          v
+
 .group w
-          w          w
+        w          w
+
 .group x
-          x          t`
-          xx         t`:
+        x          t`
+        xx         t`:
+
 .group y
-          y          y
-          yy         y:
+        y          y
+        yy         y:
+
 .group z
-          z          ts
-          zz         ts
+        z          ts
+        zz         ts
+
 .group ch
-          ch         tS 
+        ch         tS
+
 .group dh
-          dh         D  
+        dh         D
+
 .group ny
-          ny         n^ 
+        ny         n^
+
 .group ph
-          ph         p'               
+        ph         P
+
 .group sh
-          sh         S
+        sh         S
 
 .group ts
-          ts         ts
+        ts         ts
+
 .group zy
-          zy         Z
+        zy         Z

espeak-data/voices/test/om

@@ -1,2 +1,2 @@
-name oromiffa-test
+name oromo-test
 language om

phsource/ph_oromiffa

@@ -1,117 +0,0 @@
-
-//====================================================
-//  Oromiffa 
-//====================================================
-
-
-phoneme i
-  vowel starttype #i endtype #i
-  length 200
-  IfNextVowelAppend(;)
-  FMT(vowel/ii_5)
-endphoneme
-
-phoneme e
-  vowel starttype #e endtype #e
-  length 220
-  FMT(vowel/e_mid2)
-endphoneme
-
-phoneme y
-  vowel starttype #@ endtype #@
-  ipa ?
-  length 180
-
-  // assume that word-final [y] are not added by am_rules
-  // Only allow [y] in first or last syllables
-//  IF thisPh(isFinalVowel) THEN
-//  ELIF thisPh(isFirstVowel) THEN
-//  ELSE
-//    ChangePhoneme(NULL)
-//  ENDIF
-  FMT(vowel/ii#_2)
-endphoneme
-
-phoneme a
-  vowel starttype #a endtype #a
-  length 220
-  IF nextPhW(isPalatal) THEN
-    FMT(vdiph/ai_5)
-  ENDIF
-  FMT(vowel/a_6)
-endphoneme
-
-phoneme @
-  vowel starttype #@ endtype #@
-  length 220
-  IF nextPhW(isPalatal) THEN
-    FMT(vdiph/@i_2)
-  ENDIF
-  FMT(vowel/@_3)
-endphoneme
-
-phoneme o
-  vowel starttype #o endtype #o
-  length 220
-  FMT(vowel/o-_4)
-endphoneme
-
-phoneme u
-  vowel starttype #u endtype #u
-  length 220
-  FMT(vowel/u_2)
-endphoneme
-
-phoneme r
-  import_phoneme base/R2
-endphoneme
-
-phoneme k`
-  vls vel stop
-  lengthmod 2
-  Vowelin f1=0  f2=1700 -250 250  f3= -200 80 gpaus f4
-  Vowelout f1=0 f2=2300 300 400  f3=-200 80  rms=20
-  WAV(ustop/k_ejc, 60)
-endphoneme
-
-phoneme t`
-  vls alv stop
-  lengthmod 2
-  voicingswitch d
-  Vowelin f1=0  f2=1700 -300 300  f3=-100 80 gpaus
-  Vowelout f1=0 f2=1700 -300 250  f3=-100 80  rms=20
-  IF nextPh(isPause2) THEN
-    WAV(ustop/t_)
-  ENDIF
-  WAV(ustop/t_hi, 70)
-endphoneme
-
-phoneme tS`
-  vls pla afr sibilant
-  voicingswitch dZ
-  lengthmod 2
-  Vowelin f1=0  f2=1800 -200 200  f3=-100 80 gpaus
-
-  IF nextPh(isPause2) THEN
-    WAV(ustop/tsh_unasp, 80)
-  ENDIF
-  WAV(ustop/tsh_unasp, 80)
-endphoneme
-
-phoneme p'
- vcd blb stop
-  IF prevPhW(isVowel) AND nextPhW(isVowel) THEN
-    ChangePhoneme(P)
-  ENDIF
-  CALL base/b
-endphoneme
-
-phoneme D
-  vcd alv stop
-  lengthmod 6
-  voicingswitch d
-  CALL base/D
-  IF nextPh(isPause2) THEN
-    FMT(voc/dh_) addWav(vocw/dh, 35)   // weaker 
-  ENDIF
-endphoneme

phsource/phonemes

@@ -1960,7 +1960,7 @@ phonemetable kl base
 include ph_greenlandic
 
 phonemetable om base
-include ph_oromiffa
+include ph_oromo
 
 //phonemetable en2 en
 //include ph_english_test