Merge remote-tracking branch 'orotau/development'

Makefile.am

@@ -275,6 +275,7 @@ phsource/phonemes.stamp: \
 	phsource/ph_malayalam \
 	phsource/ph_maltese \
 	phsource/ph_manipuri \
+	phsource/ph_maori \
 	phsource/ph_marathi \
 	phsource/ph_nahuatl \
 	phsource/ph_nepali \
@@ -396,6 +397,7 @@ dictionaries: \
 	espeak-ng-data/lfn_dict \
 	espeak-ng-data/lt_dict \
 	espeak-ng-data/lv_dict \
+	espeak-ng-data/mi_dict \
 	espeak-ng-data/mk_dict \
 	espeak-ng-data/ml_dict \
 	espeak-ng-data/mni_dict \
@@ -720,6 +722,12 @@ dictsource/lv_extra:
 espeak-ng-data/lv_dict: src/espeak-ng phsource/phonemes.stamp dictsource/lv_list dictsource/lv_rules dictsource/lv_extra
 	cd dictsource && ESPEAK_DATA_PATH=$(PWD) LD_LIBRARY_PATH=../src:${LD_LIBRARY_PATH} ../src/espeak-ng --compile=lv && cd ..
 
+mk: espeak-ng-data/mi_dict
+dictsource/mi_extra:
+	touch dictsource/mi_extra
+espeak-ng-data/mi_dict: src/espeak-ng phsource/phonemes.stamp dictsource/mi_list dictsource/mi_rules dictsource/mi_extra
+	cd dictsource && ESPEAK_DATA_PATH=$(PWD) LD_LIBRARY_PATH=../src:${LD_LIBRARY_PATH} ../src/espeak-ng --compile=mi && cd ..
+
 mk: espeak-ng-data/mk_dict
 dictsource/mk_extra:
 	touch dictsource/mk_extra

dictsource/mi_list

@@ -0,0 +1,17 @@
+// Numbers
+_0	kore
+_1	tahi
+_2	rua
+_3	toru
+_4	faa
+_5	rima
+_6	ono
+_7	whitu
+_8	waru
+_9	iwa
+
+// Stress and raru / raruraru fix
+kōrero $1 //first syllable
+raru 'ra_ru
+raruraru 'ra_ru_:ra_ru
+urupā u_rupaa

dictsource/mi_rules

@@ -0,0 +1,62 @@
+// This file is UTF-8 encoded
+// The first symbol(s) is/are the orthography
+// The second symbol(s) is/are the name of the phoneme
+
+// Māori
+
+.group a
+             a            a
+
+.group ā
+             ā            aa
+
+.group e
+             e            e
+
+.group ē
+             ē            ee
+
+.group i
+             i            i
+
+.group ī
+             ī            ii
+
+.group o
+             o            o
+
+.group ō
+             ō            oo
+
+.group u
+             u            u
+
+.group ū
+             ū            uu
+
+
+.group h
+             h            h
+
+.group k
+             k            k
+
+.group m
+             m            m
+
+.group n
+             n            n
+			 ng			  ng
+
+.group p
+             p            p
+
+.group r
+             r            r
+
+.group t
+             t            t
+
+.group w
+             w            w
+			 wh			  f

espeak-ng-data/lang/poz/mi

@@ -0,0 +1,20 @@
+language mi
+status testing
+
+// https://github.com/espeak-ng/espeak-ng/blob/master/docs/voices.md#words
+words 1 2
+
+// taken from Jacky
+pitch  115 130
+
+formant 0 150 155 100
+formant 1 90 155 70
+formant 2 95 70 64
+formant 3 15 20 30
+formant 4 20 30 40
+formant 5 65 20 65
+formant 6 70 80 100
+formant 7 20 80 100
+formant 8 100 95 80
+voicing 135
+consonants 110

phsource/ph_maori

@@ -0,0 +1,89 @@
+// Māori phonemes
+// what follows the word 'phoneme' is the name of the phoneme
+
+//=======
+// VOWELS
+//=======
+phoneme a //so the name of this phoneme is 'a'
+  vwl starttype #a endtype #a
+  length 140
+  FMT(vowel/a_5) //from latin
+endphoneme
+
+phoneme aa //so the name of this phoneme is 'aa'
+  vwl starttype #a endtype #a
+  length 280
+  FMT(vowel/a_5) //copied from above and length doubled
+endphoneme
+
+phoneme e
+  vwl starttype #e endtype #e
+  length 140
+  FMT(vowel/e) //working hypothesis
+endphoneme
+
+phoneme ee
+  vwl starttype #e endtype #e
+  length 280
+  FMT(vowel/e) //copied from above and length doubled
+endphoneme
+
+phoneme i
+  vwl starttype #i endtype #i
+  length 140
+  FMT(vowel/i) //working hypothesis
+endphoneme
+
+phoneme ii
+  vwl starttype #i endtype #i
+  length 280
+  FMT(vowel/i) //copied from above and length doubled
+endphoneme
+
+phoneme o
+  vwl starttype #o endtype #o
+  length 140
+  FMT(vowel/o) //working hypothesis
+endphoneme
+
+phoneme oo
+  vwl starttype #o endtype #o
+  length 280
+  FMT(vowel/o) //copied from above and length doubled
+endphoneme
+
+phoneme u
+  vwl starttype #u endtype #u
+  length 140
+  FMT(vowel/u) //working hypothesis
+endphoneme
+
+phoneme uu
+  vwl starttype #u endtype #u
+  length 280
+  FMT(vowel/u) //copied from above and length doubled
+endphoneme
+
+//==========
+// DIPTHONGS
+//==========
+
+//===========
+// CONSONANTS
+//===========
+
+phoneme ng // si**ng** taken from Kyrgz (deleting what seemed from testing to be not needed)
+  vcd vel nas
+
+// don't really know why this works but is does
+  NextVowelStarts
+    VowelStart(nn/nn@)
+    VowelStart(nn/nna)
+    VowelStart(nn/nne)
+    VowelStart(nn/nni)
+    VowelStart(nn/nno)
+    VowelStart(nn/nnu)
+  EndSwitch
+
+endphoneme
+

phsource/phonemes

@@ -1185,3 +1185,5 @@ include ph_guarani
 phonemetable ky base1
 include ph_kyrgyz
 
+phonemetable mi base1
+include ph_maori