Merge pull request #108 from roedoejet/dev.moh

refactor(moh): replace H and L with 1 and 2for festival format, chang…

g2p/mappings/langs/moh/abbreviations.csv

@@ -1,2 +1,2 @@
 CONSONANT,h,k,n,r,t,s,w,',d͡ʒ,t͡ʃ,ʃ,d,ɡ,ɡʷ,kʷ,kʰʷ,f,j,ʔ
-VOWEL,a,ˈa,á:,à:,a:,à,á,e,ˈʌ̃,ʌ̃́ː,ʌ̃ː,ʌ̃̀ː,én:,en,en:,ˈe,è:,é,é:,èn,i,ˈi,i:,í:,í,ì:,ón:,òn:,on:,o:,on,ón,ó:,ò:,ˈo,o,ó,ṹː,ũ̀ː,ũ,ˈũ
+VOWEL,a,á:,à:,a:,à,á,e,ʌ̃́ː,ʌ̃ː,ʌ̃̀ː,én:,en,en:,è:,é,é:,èn,i,i:,í:,í,ì:,ón:,òn:,on:,o:,on,ón,ó:,ò:,o,ó,ṹː,ũ̀ː,ũ

g2p/mappings/langs/moh/moh_to_festival.csv

@@ -1,36 +1,36 @@
 a,a
-ˈa,aS
+á,a1
 aː,aL
-áː,aHT
-àː,aLT
-ʌ̃̀ː,eNLT
-ʌ̃́ː,eNHT
-ˈʌ̃,eNS
+áː,a1L
+àː,a2L
+ʌ̃̀ː,eN2L
+ʌ̃́ː,eN1L
+ʌ̃́,eN1
 ʌ̃ː,eNL
 ʌ̃,eN
 e,e
-ˈe,eS
-èː,eLT
-éː,eHT
+é,e1
+èː,e2L
+éː,e1L
 i,i
-ˈi,iS
+í,i1
 iː,iL
-íː,iHT
-ìː,iLT
+íː,i1L
+ìː,i2L
 k,k
 kʷ,kW
 ɡʷ,gW
 ɡ,g
 kʰʷ,kHW
 n,n
-ṹː,oNHT
-ũ̀ː,oNLT
-ˈũ,oNS
+ṹː,oN1L
+ũ̀ː,oN2L
+ṹ,oN1
 ũ,oN
 o,o
-ˈo,oS
-òː,oLT
-óː,oHT
+ó,o1
+òː,o2L
+óː,o1L
 r,r
 t,t
 d,d

g2p/mappings/langs/moh/moh_to_ipa.json

@@ -48,7 +48,7 @@
   },
   {
     "in": "á",
-    "out": "ˈa"
+    "out": "á"
   },
   {
     "in": "a",
@@ -64,7 +64,7 @@
   },
   {
     "in": "én",
-    "out": "ˈʌ̃",
+    "out": "ʌ̃́",
     "context_after": "CONSONANT|\\s|$"
   },
   {
@@ -88,7 +88,7 @@
   },
   {
     "in": "é",
-    "out": "ˈe"
+    "out": "é"
   },
   {
     "in": "e",
@@ -105,7 +105,7 @@
   },
   {
     "in": "í",
-    "out": "ˈi"
+    "out": "í"
   },
   {
     "in": "ì:",
@@ -142,7 +142,7 @@
   },
   {
     "in": "ón",
-    "out": "ˈũ"
+    "out": "ṹ"
   },
   {
     "in": "on",
@@ -160,7 +160,7 @@
   },
   {
     "in": "ó",
-    "out": "ˈo"
+    "out": "ó"
   },
   {
     "in": "o",

g2p/tests/public/data/moh.psv

@@ -1,38 +1,38 @@
 moh|moh-ipa|shé꞉kon|shéːɡũ
-moh|moh-festival|shé꞉kon|sheHTgoN
-moh-festival|moh-ipa|sheHTgoN|shéːɡũ
-moh|moh-ipa|ronwahnonterátie's|rũwahnũderˈad͡ʒeʔs|palatalization test and stresssed a #1
+moh|moh-festival|shé꞉kon|she1LgoN
+moh-festival|moh-ipa|she1LgoN|shéːɡũ
+moh|moh-ipa|ronwahnonterátie's|rũwahnũderád͡ʒeʔs|palatalization test and stresssed a #1
 moh|moh-ipa|tshiateiakorí:wake|t͡ʃadeiaɡoríːwaɡe|palatalization test and high tone i #2
-moh|moh-ipa|wahonwarihótahsien|wahũwarihˈodaʃʌ̃|palatalization test and stressed o #3
-moh|moh-ipa|ioteri'wahséhton|ioderiʔwahsˈehdũ|voicing test and stressed e #1
-moh|moh-ipa|Wahshakawénhahse|wahshaɡawˈʌ̃hahse|voicing test and stressed e #2
+moh|moh-ipa|wahonwarihótahsien|wahũwarihódaʃʌ̃|palatalization test and stressed o #3
+moh|moh-ipa|ioteri'wahséhton|ioderiʔwahséhdũ|voicing test and stressed e #1
+moh|moh-ipa|Wahshakawénhahse|wahshaɡawʌ̃́hahse|voicing test and stressed e #2
 moh|moh-ipa|watkwenhrá:rons|watɡʷʌ̃hráːrũs|voicing test and high tone a #3
-moh|moh-ipa|Sáhtkawh|sˈahtɡaf
+moh|moh-ipa|Sáhtkawh|sáhtɡaf
 moh|moh-ipa|kèn:reks|ɡʌ̃̀ːreks
-moh|moh-festival|ronwahnonterátie's|roNwahnoNderaSdze7s|palatalization test and stresssed a #1
-moh|moh-festival|tshiateiakorí:wake|chadeiagoriHTwage|palatalization test and high tone i #2
-moh|moh-festival|wahonwarihótahsien|wahoNwarihoSdaxheN|palatalization test and stressed o #3
-moh|moh-festival|ioteri'wahséhton|ioderi7wahseShdoN|voicing test and stressed e #1
-moh|moh-festival|Wahshakawénhahse|wahshagaweNShahse|voicing test and stressed e #2
-moh|moh-festival|watkwenhrá:rons|watgWeNhraHTroNs|voicing test and high tone a #3
-moh|moh-festival|Sáhtkawh|saShtgaf
-moh|moh-festival|kèn:reks|geNLTreks
-moh-festival|moh-ipa|roNwahnoNderaSdze7s|rũwahnũderˈad͡ʒeʔs|palatalization test and stresssed a #1
-moh-festival|moh-ipa|chadeiagoriHTwage|t͡ʃadeiaɡoríːwaɡe|palatalization test and high tone i #2
-moh-festival|moh-ipa|wahoNwarihoSdaxheN|wahũwarihˈodaʃʌ̃|palatalization test and stressed o #3
-moh-festival|moh-ipa|ioderi7wahseShdoN|ioderiʔwahsˈehdũ|voicing test and stressed e #1
-moh-festival|moh-ipa|wahshagaweNShahse|wahshaɡawˈʌ̃hahse|voicing test and stressed e #2
-moh-festival|moh-ipa|watgWeNhraHTroNs|watɡʷʌ̃hráːrũs|voicing test and high tone a #3
-moh-festival|moh-ipa|saShtgaf|sˈahtɡaf
-moh-festival|moh-ipa|geNLTreks|ɡʌ̃̀ːreks
-moh-festival|moh|roNwahnoNderaSdze7s|ronwahnonterátie's|palatalization test and stresssed a #1
-moh-festival|moh|chadeiagoriHTwage|tshiateiakorí:wake|palatalization test and high tone i #2
-moh-festival|moh|wahoNwarihoSdaxheN|wahonwarihótahsien|palatalization test and stressed o #3
-moh-festival|moh|ioderi7wahseShdoN|ioteri'wahséhton|voicing test and stressed e #1
-moh-festival|moh|wahshagaweNShahse|wahshakawénhahse|voicing test and stressed e #2
-moh-festival|moh|watgWeNhraHTroNs|watkwenhrá:rons|voicing test and high tone a #3
-moh-festival|moh|saShtgaf|sáhtkawh
-moh-festival|moh|geNLTreks|kèn:reks
+moh|moh-festival|ronwahnonterátie's|roNwahnoNdera1dze7s|palatalization test and stresssed a #1
+moh|moh-festival|tshiateiakorí:wake|chadeiagori1Lwage|palatalization test and high tone i #2
+moh|moh-festival|wahonwarihótahsien|wahoNwariho1daxheN|palatalization test and stressed o #3
+moh|moh-festival|ioteri'wahséhton|ioderi7wahse1hdoN|voicing test and stressed e #1
+moh|moh-festival|Wahshakawénhahse|wahshagaweN1hahse|voicing test and stressed e #2
+moh|moh-festival|watkwenhrá:rons|watgWeNhra1LroNs|voicing test and high tone a #3
+moh|moh-festival|Sáhtkawh|sa1htgaf
+moh|moh-festival|kèn:reks|geN2Lreks
+moh-festival|moh-ipa|roNwahnoNdera1dze7s|rũwahnũderád͡ʒeʔs|palatalization test and stresssed a #1
+moh-festival|moh-ipa|chadeiagori1Lwage|t͡ʃadeiaɡoríːwaɡe|palatalization test and high tone i #2
+moh-festival|moh-ipa|wahoNwariho1daxheN|wahũwarihódaʃʌ̃|palatalization test and stressed o #3
+moh-festival|moh-ipa|ioderi7wahse1hdoN|ioderiʔwahséhdũ|voicing test and stressed e #1
+moh-festival|moh-ipa|wahshagaweN1hahse|wahshaɡawʌ̃́hahse|voicing test and stressed e #2
+moh-festival|moh-ipa|watgWeNhra1LroNs|watɡʷʌ̃hráːrũs|voicing test and high tone a #3
+moh-festival|moh-ipa|sa1htgaf|sáhtɡaf
+moh-festival|moh-ipa|geN2Lreks|ɡʌ̃̀ːreks
+moh-festival|moh|roNwahnoNdera1dze7s|ronwahnonterátie's|palatalization test and stresssed a #1
+moh-festival|moh|chadeiagori1Lwage|tshiateiakorí:wake|palatalization test and high tone i #2
+moh-festival|moh|wahoNwariho1daxheN|wahonwarihótahsien|palatalization test and stressed o #3
+moh-festival|moh|ioderi7wahse1hdoN|ioteri'wahséhton|voicing test and stressed e #1
+moh-festival|moh|wahshagaweN1hahse|wahshakawénhahse|voicing test and stressed e #2
+moh-festival|moh|watgWeNhra1LroNs|watkwenhrá:rons|voicing test and high tone a #3
+moh-festival|moh|sa1htgaf|sáhtkawh
+moh-festival|moh|geN2Lreks|kèn:reks
 moh|moh-equiv|ohna'kènke|ohna'kèn:ke|low tone vowels must be long
 moh-ipa|moh|ohnaʔɡʌ̃̀ːɡe|ohna'kèn:ke|low tone vowels must be long
 moh-ipa|moh|wahrèːnehsde|wahrè:nehste|low tone vowels must be long