commit 7cda43c98510d8fc869f12f731d7b6e7c31574d2
Merge: d42105d 10c1cc8
Author: Robert Pugh <robert.pugh408@gmail.com>
Date:   Wed Jun 7 12:37:02 2023 -0700

    Merge branch 'master' of github.com:apertium/apertium-nhi

diff --combined apertium-nhi.nhi.lexc
index df34b2d,022337b..a4dfe59
--- a/apertium-nhi.nhi.lexc
+++ b/apertium-nhi.nhi.lexc
@@@ -23,12 -23,7 +23,12 @@@ Multichar_Symbol
  
  %<pl%>                                   ! Plural
  %<sg%>                                   ! Singular
 -
 +%<sg1%>
 +%<sg2%>
 +%<sg3%>
 +%<pl1%>
 +%<pl2%>
 +%<pl3%>      
  %<abs%>                                  ! Absolutivo
  
  %<loc%>                                  ! Locativo
@@@ -203,10 -198,10 +203,10 @@@ LEXICON VerbalSubjec
                                                        IrregularVerbs ;
  
  @P.Sa.Sg@%<s_sg1%>:@P.Sa.Sg@ni%>                      Object ;
 -@P.Sa.Sg@%<s_sg1%>:@P.Sa.Sg@in%>                      Object ;
 +@P.Sa.Sg@%<s_sg1%>:@P.Sa.Sg@in%>                      Object ; ! Dir/LR
  
  @P.Sa.Sg@@P.Sa.2@%<s_sg2%>:@P.Sa.Sg@@P.Sa.2@ti%>      Object ;
 -@P.Sa.Sg@@P.Sa.2@%<s_sg2%>:@P.Sa.Sg@@P.Sa.2@it%>      Object ;
 +@P.Sa.Sg@@P.Sa.2@%<s_sg2%>:@P.Sa.Sg@@P.Sa.2@it%>      Object ; ! Dir/LR
  
  @P.Sa.Sg@@P.Sa.3@%<s_sg3%>:@P.Sa.Sg@@P.Sa.3@          Object ;
  @P.Sa.Pl@%<s_pl1%>:@P.Sa.Pl@ti%>                      Object ;
@@@ -217,14 -212,14 +217,14 @@@
  @P.Sa.Sg@%<s_pl1%>:@P.Sa.Sg@ce%>                      Object ;
  
  @P.Sa.Pl@%<s_pl2%>:@P.Sa.Pl@ni%>                      Object ;
 -@P.Sa.Pl@%<s_pl2%>:@P.Sa.Pl@in%>                      Object ;
 +@P.Sa.Pl@%<s_pl2%>:@P.Sa.Pl@in%>                      Object ; ! Dir/LR
  
  @P.Sa.Pl@%<s_pl3%>:@P.Sa.Pl@                          Object ;
  
  @P.Sa.Sg@@P.Opt.ON@%<s_sg2%>:@P.Sa.Sg@@P.Opt.ON@xi%>  Object ;
  @P.Sa.Pl@@P.Opt.ON@%<s_pl2%>:@P.Sa.Pl@@P.Opt.ON@xi%>  Object ;
 -@P.Sa.Sg@@P.Opt.ON@%<s_sg2%>:@P.Sa.Sg@@P.Opt.ON@ix%>  Object ;
 -@P.Sa.Pl@@P.Opt.ON@%<s_pl2%>:@P.Sa.Pl@@P.Opt.ON@ix%>  Object ;
 +@P.Sa.Sg@@P.Opt.ON@%<s_sg2%>:@P.Sa.Sg@@P.Opt.ON@ix%>  Object ; ! Dir/LR
 +@P.Sa.Pl@@P.Opt.ON@%<s_pl2%>:@P.Sa.Pl@@P.Opt.ON@ix%>  Object ; ! Dir/LR
  
  LEXICON Object
                                                         IV-Honorific ;
@@@ -906,13 -901,6 +906,13 @@@ tlacati%<v%>%<iv%>:tlacat%>  Durative
  tlacati%<v%>%<iv%>:tlacat%>  Base2Suffixes;
  tlacati%<v%>%<iv%>:tlacati%>  Base3Suffixes;
  
 +! explotar
 +tlatoponi%<v%>%<iv%>:tlatoponi%>  PresentTense;
 +tlatoponi%<v%>%<iv%>:tlatoponi%>  Imperfect;
 +tlatoponi%<v%>%<iv%>:tlatopon%>  Durative;
 +tlatoponi%<v%>%<iv%>:tlatopon%>  Base2Suffixes;
 +tlatoponi%<v%>%<iv%>:tlatoponi%>  Base3Suffixes;
 +
  !empezar
  pehua%<v%>%<iv%>:pehua%>  PresentTense;
  pehua%<v%>%<iv%>:pehua%>  Imperfect;
@@@ -2839,13 -2827,6 +2839,13 @@@ tlazaloa%<v%>%<tv%>:tlazaloh%>  Durativ
  tlazaloa%<v%>%<tv%>:tlazaloh%>  Base2Suffixes;
  tlazaloa%<v%>%<tv%>:tlazalo%>  Base3Suffixes;
  
 +! hacer trabajar
 +tiquitiltia%<v%>%<tv2%>:tiquitiltia%>  PresentTense;
 +tiquitiltia%<v%>%<tv2%>:tiquitilta%>  Imperfect;
 +tiquitiltia%<v%>%<tv2%>:tiquitiltih%>  Durative;
 +tiquitiltia%<v%>%<tv2%>:tiquitilt%{i%}%{H%}%>  Base2Suffixes;
 +tiquitiltia%<v%>%<tv2%>:tiquitilti%>  Base3Suffixes;
 +
  
  !amar
  tlazohtla%<v%>%<tv%>:tlazohtla%>  PresentTense;
@@@ -3292,8 -3273,8 +3292,8 @@@ LEXICON Honorific !TODO: add i -> honor
  
  LEXICON PlainPlural
  
- @D.Px@@D.Sa@%<pl%>:@D.Px@@D.Sa@%>me                # ; ! Las casas
- @D.Px@@R.Sa.Pl@%<pl%>:@D.Px@@R.Sa.Pl@%>me          # ; ! Ellos son las casas
+ @D.Px@@D.Sa@%<pl%>:@D.Px@@D.Sa@%>me                # ; ! Las casas ! Dir/LR
+ @D.Px@@R.Sa.Pl@%<pl%>:@D.Px@@R.Sa.Pl@%>me          # ; ! Ellos son las casas ! Dir/LR
  @D.Px@@D.Sa@%<pl%>:@D.Px@@D.Sa@%>meh                # ; ! Las casas
  @D.Px@@R.Sa.Pl@%<pl%>:@D.Px@@R.Sa.Pl@%>meh          # ; ! Ellos son las casas
  
@@@ -3383,14 -3364,10 +3383,14 @@@ LEXICON NoSuf
  LEXICON EsSuffM
  @D.Sa.Pl@%<n%>%<barb%>%<m%>%<sg%>:@D.Sa.Pl@                           # ;
  %<n%>%<barb%>%<m%>:0                                             EsPlural ;
 +@D.Sa.Pl@%<n%>%<m%>%<sg%>:@D.Sa.Pl@                           # ;
 +%<n%>%<m%>:0                                             EsPlural ;
  
  LEXICON EsSuffF
  @D.Sa.Pl@%<n%>%<barb%>%<f%>%<sg%>:@D.Sa.Pl@                           # ;
  %<n%>%<barb%>%<f%>:0                                             EsPlural ;
 +@D.Sa.Pl@%<n%>%<f%>%<sg%>:@D.Sa.Pl@                           # ;
 +%<n%>%<f%>:0                                             EsPlural ;
  
  
  !LEXICON Rel
@@@ -3418,35 -3395,35 +3418,35 @@@ LEXICON Personale
  !
  ! Formas cortas de los pronombres personales singulares.
  !
 -nehhuatl%<prn%>%<pro%>%<p1%>%<sg%>:neh # ;
 -tehhuatl%<prn%>%<pro%>%<p2%>%<sg%>:teh # ;
 -yehhuatl%<prn%>%<pro%>%<p3%>%<sg%>:yeh # ;
 +nehhuatl%<prn%>%<pro%>%<sg1%>:neh # ;
 +tehhuatl%<prn%>%<pro%>%<sg2%>:teh # ;
 +yehhuatl%<prn%>%<pro%>%<sg3%>:yeh # ;
  
  !
  ! Formas largas de los pronombres personales singulares.
  !
 -nehhuatl%<prn%>%<pers%>%<p1%>%<sg%>:nehuatl # ;
 -tehhuatl%<prn%>%<pers%>%<p2%>%<sg%>:tehuatl # ;
 -yehhuatl%<prn%>%<pers%>%<p3%>%<sg%>:yehuatl # ;
 +nehhuatl%<prn%>%<pers%>%<sg1%>:nehuatl # ;
 +tehhuatl%<prn%>%<pers%>%<sg2%>:tehuatl # ;
 +yehhuatl%<prn%>%<pers%>%<sg3%>:yehuatl # ;
  
 -tehhuatzin%<prn%>%<pers%>%<p2%>%<sg%>%<hon%>:tohuatzin # ;
 -tehhuatzin%<prn%>%<pers%>%<p2%>%<sg%>%<hon%>:tehuatzin # ;
 -tehhuatzin%<prn%>%<pers%>%<p2%>%<sg%>%<hon%>:tehhuatzin # ;
 +tehhuatzin%<prn%>%<pers%>%<sg2%>%<hon%>:tohuatzin # ;
 +tehhuatzin%<prn%>%<pers%>%<sg2%>%<hon%>:tehuatzin # ;
 +tehhuatzin%<prn%>%<pers%>%<sg2%>%<hon%>:tehhuatzin # ;
  
  
 -nehhuatl%<prn%>%<pers%>%<p1%>%<sg%>:nehhuatl # ;
 -tehhuatl%<prn%>%<pers%>%<p2%>%<sg%>:tehhuatl # ;
 -yehhuatl%<prn%>%<pers%>%<p3%>%<sg%>:yehhuatl # ;
 +nehhuatl%<prn%>%<pers%>%<sg1%>:nehhuatl # ;
 +tehhuatl%<prn%>%<pers%>%<sg2%>:tehhuatl # ;
 +yehhuatl%<prn%>%<pers%>%<sg3%>:yehhuatl # ;
  !
  ! Pronombres personales plurales.
  !
 -tehhuan%<prn%>%<pers%>%<p1%>%<pl%>:tehuan # ;
 -nimehhuan%<prn%>%<pers%>%<p2%>%<pl%>:nimehuan # ;
 -yehhuan%<prn%>%<pers%>%<p3%>%<pl%>:yehuan # ;
 +tehhuan%<prn%>%<pers%>%<pl1%>:tehuan # ;
 +nimehhuan%<prn%>%<pers%>%<pl2%>:nimehuan # ;
 +yehhuan%<prn%>%<pers%>%<pl3%>:yehuan # ;
  
 -tehhuan%<prn%>%<pers%>%<p1%>%<pl%>:tehhuan # ;
 -nimehhuan%<prn%>%<pers%>%<p2%>%<pl%>:nimehhuan # ;
 -yehhuan%<prn%>%<pers%>%<p3%>%<pl%>:yehhuan # ;
 +tehhuan%<prn%>%<pers%>%<pl1%>:tehhuan # ;
 +nimehhuan%<prn%>%<pers%>%<pl2%>:nimehhuan # ;
 +yehhuan%<prn%>%<pers%>%<pl3%>:yehhuan # ;
  
  LEXICON Pr
  
@@@ -3455,12 -3432,10 +3455,12 @@@
  LEXICON Pr-Esp
  
  %<pr%>%<barb%>: # ; 
 +%<pr%>: # ;
  
  LEXICON AdvEs
  
  %<adv%>%<barb%>: # ; 
 +%<adv%>: # ;
  
  
  LEXICON Adv 
@@@ -3546,8 -3521,8 +3546,8 @@@ ce:c
  cada%<barb%>:cada                               DET ; ! cada
  oc%<adv%>+ce:occe                               DET ;  ! otro
  miac%<det%>:miac                                # ; ! mucho
- miac%<det%>%<pl%>:miaqu%>eh                     # ; ! muchos
- miac%<det%>%<pl%>:miqu%>eh                      # ; ! muchos
+ miac%<det%>%<pl%>:miaqu%>eh                     # ; ! muchos 
+ miac%<det%>%<pl%>:miqu%>eh                      # ; ! muchos ! Dir/LR
  
  LEXICON Pronombres 
  nin%<pron%>:nin                                         # ; ! "estx"
@@@ -3883,7 -3858,6 +3883,7 @@@ misa:mis
  molecula:molecula                               EsSuffF ;
  ofrenda:ofrenda                                 EsSuffF ;
  oportunidad:oportunidad                         EsSuffF ;
 +celular:celular                                 EsSuffM ;
  palabra:palabra                                 EsSuffF ;
  paleta:paleta                                   EsSuffF ;
  pan:pan                                         EsSuffM ;
@@@ -4055,8 -4029,7 +4055,8 @@@ bailar:baila
  lado:lado                                       EsSuffM ;
  pohyoh:pohyoh                                   EsSuffM ;
  gente:gente                                     EsSuffF ;
 -
 +horno:horno                                     EsSuffM ;
 +microondas:microondas                           EsSuffM ;
  
  
  LEXICON Adjetivos
@@@ -4231,6 -4204,7 +4231,7 @@@ queman%<cnjsub%>:queman # 
  LEXICON Interjecciones 
  
  ay:ay                        INTJ ; ! "ay"
+ aaa:aaa                      INTJ ; ! "aaa"
  igual:igual                  INTJ ; ! "igual"
  sí:sí                        INTJ ; ! "sí"