commit 710e36f2923d9f6dffa0dd258c5ad042069cbeb8 Author: Robert Pugh Date: Tue Aug 22 17:48:56 2023 -0400 add flexibility for pret ih/eh/e diff --git a/apertium-nhi.nhi.lexc b/apertium-nhi.nhi.lexc index 28c76ee..91c5270 100644 --- a/apertium-nhi.nhi.lexc +++ b/apertium-nhi.nhi.lexc @@ -1506,13 +1506,6 @@ cuatiqui%%:cuatiqui%> Durative; cuatiqui%%:cuatiqui%{H%}%{P%}%> Base2Suffixes; cuatiqui%%:cuatiqui%> Base3Suffixes; -! tejer -ihquiti%%:ihquiti%> PresentTense; -ihquiti%%:ihquiti%> Imperfect; -ihquiti%%:ihqui%> Durative; -ihquiti%%:ihquit%> Base2Suffixes; -ihquiti%%:ihquiti%> Base3Suffixes; - !esperar chiya%%:chiya%> PresentTense; chiya%%:chiya%> Imperfect; @@ -1846,6 +1839,13 @@ abandonaroa%%:abandonaroh%> Base2Suffixes; abandonaroa%%:abandonaro%> Base2Suffixes; abandonaroa%%:abandonaro%> Base3Suffixes; +! tejer +ihquiti%%:ihquiti%> PresentTense; +ihquiti%%:ihquiti%> Imperfect; +ihquiti%%:ihqui%> Durative; +ihquiti%%:ihquit%> Base2Suffixes; +ihquiti%%:ihquiti%> Base3Suffixes; + ! aparecer apareceroa%%:apareceroa%> PresentTense; apareceroa%%:apareceroa%> Imperfect; @@ -3902,6 +3902,8 @@ mas%:mas # ; amo%:amo # ; amo%:amo # ; +%tech%%: ich # ; + quema%:quema # ; yeyi%:yeyi # ; ! tres @@ -3978,7 +3980,7 @@ ciqui%:ciqui # ; ! "un@s" oc%+ciqui%:occiqui # ; ! "un@s mas" ce%:ce # ; ! un(o) oc%+ce%:occe # ; ! otro - +tlenza%:tlenza # ; ! lo que sea miac%:miac # ; ! mucho miac%%:miaqu%>eh # ; ! muchos miac%%:miqu%>eh # ; ! muchos @@ -4018,6 +4020,8 @@ amelatl: amelatl TlSuff ; ! "manantial" atl:a TlSuff ; ! "agua" istagatl:istaga TlSuff ; ! "agua salada" hueyiistagatl:hueyiistaga TlSuff ; ! "agua del mar" +nezcayotl:nezcayo TlSuff ; ! "imagen" + cacalotl:cacalo TlSuff ; ! "cuervo" cihuatl:cihua TlSuff ; ! "mujer" @@ -4657,7 +4661,7 @@ LEXICON AdjDim %: Diminutivo ; LEXICON Adj -%:0 # ; +%%:0 # ; LEXICON Adj-Esp-mf diff --git a/apertium-nhi.nhi.spellrelax b/apertium-nhi.nhi.spellrelax index 0fd894f..54a4959 100644 --- a/apertium-nhi.nhi.spellrelax +++ b/apertium-nhi.nhi.spellrelax @@ -27,6 +27,7 @@ [ u (->) 0 || a _ h .#. ] .o. [ n (->) h || _ .#. ] .o. [ u (->) 0 || _ h .#. ] .o. + [ ?* [e h .#. -> i h .#. | e h .#.] ?*] .o. [c (->) 0 || _ [c | q]] .o. [ ?* [ ʼ -> [ %' | ’ | %` | %´ | %‘ | %ʻ ] | ʼ ] ?* ] ] diff --git a/apertium-nhi.nhi.twol b/apertium-nhi.nhi.twol index 4542481..e78e930 100644 --- a/apertium-nhi.nhi.twol +++ b/apertium-nhi.nhi.twol @@ -139,11 +139,19 @@ m:n <=> i _ %>: [ c | t | n | s | y ] ; "nasal place assimilation in object prefix" %{m%}:m <=> _ %>: [Vow | p: | b: | m:]; + + +"Possessive ending [w] after cons" +%{u%}:0 <=> Cns %>: _ %{h%}:0 .#. ; + +"Possessive ending [w] after cons second component" +%{h%}:0 <=> Cns %>: %{u%}:0 _ .#. ; + "Possessive ending [w] after vowel" -%{u%}:0 <=> Cns %>: _ %{h%}: .#. ; +%{u%}:u <=> Vow %>: _ %{h%}:h .#. ; "Possessive ending [w] after vowel second component" -%{h%}:0 <=> Cns %>: %{u%}:0 _ .#. ; +%{h%}:h <=> Vow %>: %{u%}:u _ .#. ; !@ n o >:> t i p o z >:> {u}:0 {h}:0 @@ -173,3 +181,4 @@ m:n <=> i _ %>: [ c | t | n | s | y ] ; "inv. Metathesis of -{h}{u} for {u}" %{h%}:h <=> _ %{u%}:u [Vow | >:]; +