mi: use phoneme names consistent with the rest of espeak-ng, and clean up the comments to remove redundant statements

phsource/ph_maori

@@ -1,81 +1,76 @@
 // 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'
+
+phoneme a
   vwl starttype #a endtype #a
   length 140
-  FMT(vowel/a_5) //from latin
+  FMT(vowel/a_5) // from latin
 endphoneme
 
-phoneme aa //so the name of this phoneme is 'aa'
+phoneme a:
   vwl starttype #a endtype #a
   length 280
-  FMT(vowel/a_5) //copied from above and length doubled
+  FMT(vowel/a_5)
 endphoneme
 
 phoneme e
   vwl starttype #e endtype #e
   length 140
-  FMT(vowel/e) //working hypothesis
+  FMT(vowel/e) // working hypothesis
 endphoneme
 
-phoneme ee
+phoneme e:
   vwl starttype #e endtype #e
   length 280
-  FMT(vowel/e) //copied from above and length doubled
+  FMT(vowel/e)
 endphoneme
 
 phoneme i
   vwl starttype #i endtype #i
   length 140
-  FMT(vowel/i) //working hypothesis
+  FMT(vowel/i) // working hypothesis
 endphoneme
 
-phoneme ii
+phoneme i:
   vwl starttype #i endtype #i
   length 280
-  FMT(vowel/i) //copied from above and length doubled
+  FMT(vowel/i)
 endphoneme
 
 phoneme o
   vwl starttype #o endtype #o
   length 140
-  FMT(vowel/o) //working hypothesis
+  FMT(vowel/o) // working hypothesis
 endphoneme
 
-phoneme oo
+phoneme o:
   vwl starttype #o endtype #o
   length 280
-  FMT(vowel/o) //copied from above and length doubled
+  FMT(vowel/o)
 endphoneme
 
 phoneme u
   vwl starttype #u endtype #u
   length 140
-  FMT(vowel/u) //working hypothesis
+  FMT(vowel/u) // working hypothesis
 endphoneme
 
-phoneme uu
+phoneme u:
   vwl starttype #u endtype #u
   length 280
-  FMT(vowel/u) //copied from above and length doubled
+  FMT(vowel/u)
 endphoneme
 
-//==========
-// DIPTHONGS
-//==========
-
 //===========
 // CONSONANTS
 //===========
 
-phoneme ng // si**ng** taken from Kyrgz (deleting what seemed from testing to be not needed)
+phoneme N // si**ng** (modified from Kyrgz)
   vcd vel nas
 
-// don't really know why this works but is does
   NextVowelStarts
     VowelStart(nn/nn@)
     VowelStart(nn/nna)
@@ -84,6 +79,5 @@ phoneme ng // si**ng** taken from Kyrgz (deleting what seemed from testing to be
     VowelStart(nn/nno)
     VowelStart(nn/nnu)
   EndSwitch
-
 endphoneme