commit ea3127d6bdc2f6e8e8531880f42ef5dafe5e05ce
Author: Robert Pugh <robert.pugh408@gmail.com>
Date:   Mon Aug 21 21:20:25 2023 -0400

    fix twol

diff --git a/apertium-nhi.nhi.lexc b/apertium-nhi.nhi.lexc
index 92d5c9a..4884468 100644
--- a/apertium-nhi.nhi.lexc
+++ b/apertium-nhi.nhi.lexc
@@ -136,6 +136,7 @@ Multichar_Symbols
 %{e%}                                    ! e / 0
 %{h%}                                    ! h / u
 %{u%}                                    ! u / h
+%{U%}                                    ! u in "qui"
 %{H%}
 %{m%}                                    ! m / n
 %{q%}
@@ -261,8 +262,8 @@ LEXICON TV2-IOBJ
 
 %<i_sg1%>:nech%>                                    TV2-DOBJ ;
 %<i_sg2%>:mitz%>                                    TV2-DOBJ ;
-%<i_sg3%>:%{q%}%{u%}%{i%}%>                         TV2-DOBJ ;
-%<i_sg3%>:qui%>                                     TV2-DOBJ ;
+%<i_sg3%>:%{q%}%{U%}%{i%}%>                         TV2-DOBJ ;
+! %<i_sg3%>:qui%>                                     TV2-DOBJ ;
 %<i_pl1%>:tech%>                                    TV2-DOBJ ;
 %<i_pl2%>:mech%>                                    TV2-DOBJ ;
 %<i_pl3%>:qui%{m%}%>                                TV2-DOBJ ;
@@ -310,8 +311,8 @@ TV2-Stem ;
 LEXICON TV-DOBJ
 %<o_sg1%>:nech%>             TV-Honorific ;
 %<o_sg2%>:mitz%>             TV-Honorific ;
-%<o_sg3%>:%{q%}%{u%}%{i%}%>  TV-Honorific ;
-%<o_sg3%>:qui%>              TV-Honorific ;
+%<o_sg3%>:%{q%}%{U%}%{i%}%>  TV-Honorific ;
+! %<o_sg3%>:qui%>              TV-Honorific ;
 
 ! With 3sg obj (and not 3 sbj, and not honorific ), the object prefix can be
 ! omitted optionally. eg "ni-0-piya" "yo lo tengo". this is more of a 
@@ -3715,8 +3716,8 @@ LEXICON TlSuff
 LEXICON ItlSuff
 
 @D.Px@@D.Sa.Pl@%<n%>%<abs%>:@D.Px@@D.Sa.Pl@%>itl   # ;
-@D.Sa.Pl@@R.Px@%<n%>:@D.Sa.Pl@@R.Px@%>i%{u%}%{h%}  # ;
-%<n%>:                                            Plural ;
+@D.Sa.Pl@@R.Px@%<n%>:@D.Sa.Pl@@R.Px@               # ;
+%<n%>:                                             Plural ;
 %<n%>:                                             Deriv ;
 
 LEXICON TliSuff
@@ -4096,7 +4097,6 @@ totoniliztl:totoniliz                           TlSuff ; ! "ardor, calor"
 acahualxochitl:acahualxochi                     TlSuff ;
 tonahuatl:tonahua                               TlSuff ;
 tichalotl:tichalo                               TlSuff ;
-xihuitl:xihui                                   TlSuff ;
 comitl:comi                                     TlSuff ;
 itl:i                                           TlSuff ;
 cetlacatl:cetlaca                               TlSuff ;
@@ -4263,7 +4263,7 @@ tlanamacaloyan:tlanamacaloyan                   NoSuff ; ! "mercado(tienda"
 caxitl:cax                                      ItlSuff ; ! "plato"
 cohuitl:coh                                     ItlSuff ; ! "árbol/madera/monte"
 chiquihuitl:chiqui%{u%}%{h%}                    ItlSuff ; ! "canasta"
-xihuitl:xi%{u%}%{h%}                            ItlSuff ; ! "hierba, año"
+xihuitl:xi%{h%}%{u%}                            ItlSuff ; ! "hierba, año"
 cueyitl:cuey                                    ItlSuff ; ! "falda"
 iztaccueyitl:iztaccuey                          ItlSuff ; ! "falda"
 tlilticcueyitl:tlilticcuey                      ItlSuff ; ! "falda"
diff --git a/apertium-nhi.nhi.twol b/apertium-nhi.nhi.twol
index f5fcee6..2caca6b 100644
--- a/apertium-nhi.nhi.twol
+++ b/apertium-nhi.nhi.twol
@@ -4,8 +4,8 @@ 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
  %{i%}:i %{i%}:0
  %{h%}:h %{h%}:u %{H%}:0 %{H%}:h
- %{u%}:u
- %{u%}:0
+ %{u%}:u %{u%}:h
+ %{U%}:u %{U%}:0
  %{q%}:q %{q%}:c
  %{m%}:m %{m%}:n
  %{c%}:c %{c%}:0
@@ -64,24 +64,34 @@ i:0 <=> [n | m | t] o >:> _ [ [ Cns Cns ] - [ t z | t l | c h ] | t l Cns | t z
 "ih -> e in preterite (1)"
 i:e <=> _ %{H%}: %{P%}:0 >:> %{c%}:0 ;
 
+"q:q at beginning of word in qui"
+%{q%}:q <=> .#. _ %{U%}: %{i%}: >:> Cns ;
+
+"u:u at beginning of word in qui"
+%{U%}:u <=> .#. %{q%}:q _ %{i%}: >:> Cns ;
+
+"i:i at beginning of word in qui"
+%{i%}:i <=> .#. %{q%}:q %{U%}:u _ >:> Cns ;
+
 
 "'q' -> 'c' in /k/ between a V and a C "
-%{q%}:c <=> Vow >:> _ %{u%}: %{i%}: >:> Cns ;
+%{q%}:c <=> Vow >:> _ %{U%}: %{i%}: >:> Cns ;
 
 "'q' -> 'c' in /k/ when followed by a V "
-%{q%}:c <=> >:> _ %{u%}: %{i%}: >:> [a | o | u] ;
+%{q%}:c <=> >:> _ %{U%}: %{i%}: >:> [a | o | u] ;
 
 "u -> 0 in /k/ between V and C"
-%{u%}:0 <=> Vow >:> %{q%}: _ %{i%}: >:> Cns ;
+%{U%}:0 <=> Vow >:> %{q%}: _ %{i%}: >:> Cns ;
 
 "u -> 0 in /k/ when followed by a V"
-%{u%}:0 <=> >:> %{q%}: _ %{i%}: >:> [a | o | u] ;
+%{U%}:0 <=> >:> %{q%}: _ %{i%}: >:> [a | o | u] ;
 
 "i -> 0 in /k/ between V and C"
-%{i%}:0 <=> Vow >:> %{q%}: %{u%}: _ >:> Cns ;
+%{i%}:0 <=> Vow >:> %{q%}: %{U%}: _ >:> Cns ;
+
 
 "i -> 0 in /k/ when followed by a V"
-%{i%}:0 <=> %{q%}: %{u%}: _ >:> Vow ;
+%{i%}:0 <=> %{q%}: %{U%}: _ >:> Vow ;
 
 "Weak /i/ drops after tla"
 i:0 <=> t l a >:> _ h ;
@@ -112,13 +122,18 @@ m:n <=> i _ %>: [ c | t | n | s | y ] ;
 !%{H%}:0 <=> %{i%}:e _ >:> %{c%}: .#. ;
 
 "Metathesis of -{h}{u} for {h}"
-%{u%}:h <=  _ %{h%}: %>: i t l ;
+%{u%}:h <= %{h%}:u _ [Cns | .#.];
 
-!@ x i {u}:h {h}:u >:> i t l
-!@ x i {u}:h {h}:u >:> i t l 
 !@ n o >:> x i {u}:u {h}:h
 
 "Metathesis of -{h}{u} for {u}"
-%{h%}:u <=> %{u%}:h _ [Cns | .#.]; 
+%{h%}:u <=> _ %{u%}:h [Cns | .#.]; 
 
 
+"inv. Metathesis of -{h}{u} for {h}"
+%{u%}:u <= %{h%}:h _ [Vow | >:];
+
+!@ n o >:> x i {u}:u {h}:h
+
+"inv. Metathesis of -{h}{u} for {u}"
+%{h%}:h <=> _ %{u%}:u [Vow | >:];