commit a7295bb8f56dd914ad52c32fc2405529f9c12a1a
Author: Robert Pugh <robert.pugh408@gmail.com>
Date:   Tue Aug 22 10:44:26 2023 -0400

    fix twol rules for obj pref

diff --git a/apertium-nhi.nhi.lexc b/apertium-nhi.nhi.lexc
index c92b162..afb7bc2 100644
--- a/apertium-nhi.nhi.lexc
+++ b/apertium-nhi.nhi.lexc
@@ -234,7 +234,7 @@ LEXICON VerbalSubject
 !
 ! ce- subj prefix is 1pl but takes singular subject tense/aspect agreement.
 !
-@P.Sa.Sg@%<s_pl1%>:@P.Sa.Sg@ce%>                      Object ;
+@P.Sa.Sg@%<s_pl1%>:@P.Sa.Sg@ce%>                      Object ; ! Dir/LR
 @P.Sa.Sg@%<s_ind%>:@P.Sa.Sg@ce%>                      Object ;
 
 @P.Sa.Pl@%<s_pl2%>:@P.Sa.Pl@ni%>                      Object ;
@@ -4594,7 +4594,7 @@ frances:frances        Adj-Esp-mf ;  ! "francés"
 español:español        Adj-Esp-mf ; ! "español"
 patronal:patronal      Adj-Esp-mf ; ! "patronal"
 austral:austral        Adj-Esp-mf ; ! ""
-principal:principal        Adj-Esp-mf ; ! ""
+principal:principal    Adj-Esp-mf ; ! ""
 electromagnética:electromagnétic Adj-Esp-m/f ;
 espacial:espacial      Adj-Esp-mf ;
 nanométrico:nanométric Adj-Esp-m/f ;
@@ -4635,6 +4635,10 @@ LEXICON Adj
 
 LEXICON Adj-Esp-mf
 %<adj%>%<mf%>%<barb%>:0  # ;
+%<adj%>%<mf%>:0  # ;
+%<adj%>%<mf%>%<barb%>%<pl%>:%>%{e%}s  # ;
+%<adj%>%<mf%>%<pl%>:%>%{e%}s  # ;
+
 
 LEXICON Adj-Esp-m/f
 %<adj%>%<barb%>%<m%>:o  # ;
@@ -4642,6 +4646,11 @@ LEXICON Adj-Esp-m/f
 %<adj%>%<barb%>%<m%>%<pl%>:os  # ;
 %<adj%>%<barb%>%<f%>%<pl%>:as  # ;
 
+%<adj%>%<m%>:o  # ;
+%<adj%>%<f%>:a  # ;
+%<adj%>%<m%>%<pl%>:os  # ;
+%<adj%>%<f%>%<pl%>:as  # ;
+
 
 
 LEXICON Adverbios 
@@ -4726,6 +4735,7 @@ zancican:zancican            Adv ; ! junto (en un solo lugar)
 LEXICON Preposiciones 
 
 de:de                        Pr-Esp ;  ! "de"
+de%<pr%>%+el%<det%>%<def%>:de%>l #;
 a:a                          Pr-Esp ;  ! "a"
 por:por                      Pr-Esp ;  ! "por"
 en:en                      Pr-Esp ;  ! "en"
diff --git a/apertium-nhi.nhi.twol b/apertium-nhi.nhi.twol
index 9490a39..4f65120 100644
--- a/apertium-nhi.nhi.twol
+++ b/apertium-nhi.nhi.twol
@@ -3,7 +3,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
  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
+ %{h%}:h %{h%}:u 
+ %{H%}:0 %{H%}:h
  %{u%}:u %{u%}:h
  %{U%}:u %{U%}:0
  %{q%}:q %{q%}:c
@@ -36,6 +37,10 @@ i:o <=> [ n | t | x ] _ >:> %{q%}:c %{u%}:0 %{i%}:0 >:> o n >:> ;
 %{e%}:0 <=> Vow >:> _ s ;
 !@ n o >:> c o m p a ñ e r o >:> {e}:0 s
 
+"Plural Spanish Nouns after cons"
+%{e%}:e <=> Cns >:> _ s ;
+!@ n o >:> c o m p a ñ e r o >:> {e}:0 s
+
 "Nasal assimilation"
 n:0 <=> _ %>: m e ;
 
@@ -68,6 +73,12 @@ 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 ;
 
+"%{H%} -> 0 in i:e h pret"
+%{H%}:0 <=> i:e _ %{P%}:0 >:> %{c%}:0 .#.;
+
+"%{H%} -> h in plural preterite"
+%{H%}:h <=> Vow _ %{P%}:0 >:> q: u: e: ;
+
 
 "q:q at beginning of word in qui"
 %{q%}:q <=> .#. _ %{U%}: %{i%}: >:> Cns ;
@@ -79,24 +90,42 @@ i:e <=> _ %{H%}: %{P%}:0 >:> %{c%}:0 ;
 %{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' in /k/ when followed by a V "
-%{q%}:c <=> >:> _ %{U%}: %{i%}: >:> [a | o | u] ;
-
 "u -> 0 in /k/ between V and C"
 %{U%}:0 <=> Vow >:> %{q%}: _ %{i%}: >:> Cns ;
 
-"u -> 0 in /k/ when followed by a V"
-%{U%}:0 <=> >:> %{q%}: _ %{i%}: >:> [a | o | u] ;
-
 "i -> 0 in /k/ between V and C"
 %{i%}:0 <=> Vow >:> %{q%}: %{U%}: _ >:> Cns ;
 
-"i -> 0 in /k/ when followed by a front vowel"
+
+
+
+"'q' -> 'q' in /k/ before front vowel "
+%{q%}:q <=> _ %{U%}: %{i%}: >:> [i | e] ;
+
+"u -> u in /k/ before front vowel"
+%{U%}:u <=> %{q%}: _ %{i%}: >:> [i | e] ;
+
+"i -> 0 in /k/ before front vowel"
 %{i%}:0 <=> %{q%}: %{U%}: _ >:> [i | e] ;
 
+
+
+"'q' -> 'c' in /k/ when followed by a V "
+%{q%}:c <=> >:> _ %{U%}:0 %{i%}:0 >:> [a | o | u] ;
+
+"u -> 0 in /k/ when followed by a V"
+%{U%}:0 <=> >:> %{q%}:c _ %{i%}:0 >:> [a | o | u] ;
+
+"i -> 0 in /k/ when followed by a V"
+%{i%}:0 <=> >: %{q%}:c %{U%}:0 _ >:> [a | o | u]  ;
+
+
+
 "Weak /i/ drops after tla"
 i:0 <=> t l a >:> _ h ;