commit df1cf126ff94a04d1c86181088d86162e300f627 Author: Robert Pugh Date: Fri Aug 25 16:10:19 2023 -0400 fix Cns uh in poss2 diff --git a/apertium-nhi.nhi.lexc b/apertium-nhi.nhi.lexc index 403225e..47d9ed1 100644 --- a/apertium-nhi.nhi.lexc +++ b/apertium-nhi.nhi.lexc @@ -32,15 +32,6 @@ Multichar_Symbols % % ! Absolutivo -% ! -% ! -% ! -% ! - - -% -% - % ! Locativo % ! Topónimo @@ -3971,8 +3962,8 @@ in:in DET ; ! "a" nin:nin DET ; ! "estx" el%%:el #; ! "" el%%:la #; ! "" -el%%%:los #; ! "" -el%%%:las #; ! "" +el%%%:las #; ! "" +el%%%:las #; ! "" de%+el%%:del #; nochi:nochi DET ; ! "todo" non:non DET ; ! "esx" @@ -4630,7 +4621,7 @@ ohueh:ohueh Adj ; ! "difícil" atrasado:atrasad Adj-Esp-m/f ; ! "atrasado" lácteo:lácte Adj-Esp-m/f ; ! "milky" - +morado:morad Adj-Esp-m/f ; ! "" originario:originari Adj-Esp-m/f ; ! "originating" borracho:borrach Adj-Esp-m/f ; ! reconocido:reconocid Adj-Esp-m/f ; ! "reconocido" @@ -4686,9 +4677,9 @@ LEXICON Adj LEXICON Adj-Esp-mf -%%%%:0 # ; +%%%%:0 # ; %%%:0 # ; -%%%%:%>%{e%}s # ; +%%%%:%>%{e%}s # ; %%%:%>%{e%}s # ; @@ -4760,7 +4751,6 @@ ohcón:ohcón Adv ; ! así ohcon:ohcon Adv ; ! así ihquín:ihquín Adv ; ! así ihquin:ihquin Adv ; ! así -así:así AdvEs ; ! así ompa:ompa Adv ; ! allá quemazá:quemazá Adv ; ! a veces queme:queme Adv ; ! como diff --git a/apertium-nhi.nhi.twol b/apertium-nhi.nhi.twol index 950efd3..04598c0 100644 --- a/apertium-nhi.nhi.twol +++ b/apertium-nhi.nhi.twol @@ -3,9 +3,11 @@ Alphabet A B C D E F G H I J K L M N O P Q R S T U W X Y Z a b c d e f g h i j k l m n o p q r s t u w x y z %{i%}:i %{i%}:0 - %{h%}:h %{h%}:u + %{h%}:h %{h%}:u + %{h%}:0 %{H%}:0 %{H%}:h %{u%}:u %{u%}:h + %{u%}:0 %{U%}:u %{U%}:0 %{q%}:q %{q%}:c %{m%}:m %{m%}:n @@ -141,25 +143,30 @@ m:n <=> i _ %>: [ c | t | n | s | y ] ; -"Possessive ending [w] after cons" -%{u%}:0 <=> Cns %>: _ :0 .#. ; - except - _ %>: ; +! "Possessive ending [w] after cons" +! %{u%}:0 <=> Cns %>: _ :0 .#. ; +! except +! _ %>: ; -"Possessive ending [w] after cons second component" -%{h%}:0 <=> Cns %>: :0 _ .#. ; - except - _ :* %>: ; +! "Possessive ending [w] after cons second component" +! %{h%}:0 <=> Cns %>: :0 _ .#. ; +! except +! _ :* %>: ; -!"Possessive ending [w] after vowel" -!%{u%}:u <=> Vow %>: _ :h .#. ; +"Possessive ending [w] after vowel (u)" +%{u%}:0 <=> Cns %>: _ %{h%}: .#. ; + +"Possessive ending [w] after vowel (h)" +%{h%}:0 <=> Cns %>: %{u%}: _ .#. ; + +! "Possessive ending [w] after vowel" +! %{u%}:u <=> Vow %>: _ :h .#. ; ! except ! _ %>: ; -!@ x i {h}:h {u}:u > i t l -!"Possessive ending [w] after vowel second component" -!%{h%}:h <=> Vow %>: :u _ .#. ; +! "Possessive ending [w] after vowel second component" +! %{h%}:h <=> Vow %>: :u _ .#. ; ! except ! _ :* %>: ; @@ -176,12 +183,12 @@ m:n <=> i _ %>: [ c | t | n | s | y ] ; !%{H%}:0 <=> %{i%}:e _ >:> %{c%}: .#. ; "Metathesis of -{h}{u} for {h}" -%{u%}:h <=> %{h%}:u _ [Cns | .#.]; +%{u%}:h <=> Vow >:? %{h%}:u _ [Cns | .#.]; !@ n o >:> x i {u}:u {h}:h "Metathesis of -{h}{u} for {u}" -%{h%}:u <=> _ %{u%}:h [Cns | .#.]; +%{h%}:u <=> Vow >:? _ %{u%}:h [Cns | .#.]; "inv. Metathesis of -{h}{u} for {h}"