commit 64c85cfc59b0fe58b8d5de219d42a4ce7038b78b Author: Robert Pugh Date: Tue Apr 4 12:03:46 2023 -0400 changes diff --git a/Makefile.am b/Makefile.am index 8d54fbd..ea73220 100644 --- a/Makefile.am +++ b/Makefile.am @@ -48,7 +48,7 @@ TARGETS_INTERMEDIATE = $(LANG1).mor.hfst $(LANG1).seg.hfst $(LANG1).gen.hfst $(L # notipehuan:no>tipe>huan .deps/nhi.seg.hfst: .deps/nhi.mor.hfst .deps/nhi.gen.hfst - hfst-compose -1 .deps/nhi.mor.hfst -2 .deps/nhi.gen.hfst -o .deps/nhi.seg.hfst + hfst-compose -F -1 .deps/nhi.mor.hfst -2 .deps/nhi.gen.hfst -o .deps/nhi.seg.hfst .deps/nhi.phon.hfst: apertium-nhi.nhi.phon hfst-lexc apertium-nhi.nhi.phon -o $@ @@ -60,7 +60,7 @@ TARGETS_INTERMEDIATE = $(LANG1).mor.hfst $(LANG1).seg.hfst $(LANG1).gen.hfst $(L hfst-regexp2fst -S -o $@ < $< .deps/nhi-nhi_$(VAR1).phon.hfst: .deps/nhi.phon.hfst .deps/nhi.phon_$(VAR1).hfst - hfst-invert .deps/nhi.phon_$(VAR1).hfst | hfst-compose -1 .deps/nhi.phon.hfst -2 - -o $@ + hfst-invert .deps/nhi.phon_$(VAR1).hfst | hfst-compose -F -1 .deps/nhi.phon.hfst -2 - -o $@ $(LANG1)-$(LANG1)_$(VAR1).autoconv.hfst: .deps/nhi-nhi_$(VAR1).phon.hfst hfst-fst2fst -w $< -o $@ diff --git a/apertium-nhi.nhi.lexc b/apertium-nhi.nhi.lexc index 9899d87..b34942c 100644 --- a/apertium-nhi.nhi.lexc +++ b/apertium-nhi.nhi.lexc @@ -854,8 +854,8 @@ moburlaroa%%:moburlaro%> Base3Suffixes; !pasar panoa%%:panoa%> PresentTense; panoa%%:panoa%> Imperfect; -panoa%%:panoh%> Durative; -panoa%%:panoh%> Base2Suffixes; +panoa%%:pano%> Durative; +panoa%%:pano%> Base2Suffixes; panoa%%:pano%> Base3Suffixes; @@ -1259,6 +1259,118 @@ apaca%%: apaca%> Durative ; apaca%%: apaca%> Base2Suffixes ; apaca%%: apaca%> Base3Suffixes ; +! hervir (el nixtamal) +pixquiltia%%:pixquiltia%> PresentTense ; +pixquiltia%%:pixquiltia%> Imperfect ; +pixquiltia%%:pixquilti%> Durative ; +pixquiltia%%:pixquilt%{i%}%{H%}%> Base2Suffixes ; +pixquiltia%%:pixquilti%> Base3Suffixes ; + +! sacar +quihquixtania%%:quihquixtania%> PresentTense ; +quihquixtania%%:quihquixtania%> Imperfect ; +quihquixtania%%:quihquixtani%> Durative ; +quihquixtania%%:quihquixtan%{i%}%{H%}%> Base2Suffixes ; +quihquixtania%%:quihquixtani%> Base3Suffixes ; + +! aguantar? +pacahyohuia%%:pacahyohuia%> PresentTense ; +pacahyohuia%%:pacahyohuia%> Imperfect ; +pacahyohuia%%:pacahyohui%> Durative ; +pacahyohuia%%:pacahyohu%{i%}%{H%}%> Base2Suffixes ; +pacahyohuia%%:pacahyohui%> Base3Suffixes ; + +! rebasar, pasar +panahuia%%:panahuia%> PresentTense ; +panahuia%%:panahuia%> Imperfect ; +panahuia%%:panahui%> Durative ; +panahuia%%:panahu%{i%}%{H%}%> Base2Suffixes ; +panahuia%%:panahui%> Base3Suffixes ; + +! rebasar, pasar +panohuia%%:panohuia%> PresentTense ; +panohuia%%:panohuia%> Imperfect ; +panohuia%%:panohui%> Durative ; +panohuia%%:panohu%{i%}%{H%}%> Base2Suffixes ; +panohuia%%:panohui%> Base3Suffixes ; + +! tirar para abajo +pantlatihuia%%:pantlatihuia%> PresentTense ; +pantlatihuia%%:pantlatihuia%> Imperfect ; +pantlatihuia%%:pantlatihui%> Durative ; +pantlatihuia%%:pantlatihu%{i%}%{H%}%> Base2Suffixes ; +pantlatihuia%%:pantlatihui%> Base3Suffixes ; + +! echarle agua a algo +tequilia%%:tequilia%> PresentTense ; +tequilia%%:tequilia%> Imperfect ; +tequilia%%:tequili%> Durative ; +tequilia%%:tequil%{i%}%{H%}%> Base2Suffixes ; +tequilia%%:tequili%> Base3Suffixes ; + +! cortar +tiquilia%%:tiquilia%> PresentTense ; +tiquilia%%:tiquilia%> Imperfect ; +tiquilia%%:tiquili%> Durative ; +tiquilia%%:tiquil%{i%}%{H%}%> Base2Suffixes ; +tiquilia%%:tiquili%> Base3Suffixes ; + +! jalarle a alguien +tilanilia%%:tilanilia%> PresentTense ; +tilanilia%%:tilanilia%> Imperfect ; +tilanilia%%:tilanili%> Durative ; +tilanilia%%:tilanil%{i%}%{H%}%> Base2Suffixes ; +tilanilia%%:tilanili%> Base3Suffixes ; + +! apretar +tilinia%%:tilinia%> PresentTense ; +tilinia%%:tilinia%> Imperfect ; +tilinia%%:tilini%> Durative ; +tilinia%%:tilin%{i%}%{H%}%> Base2Suffixes ; +tilinia%%:tilini%> Base3Suffixes ; + +! hacer trabajar +tiquitiltia%%:tiquitiltia%> PresentTense ; +tiquitiltia%%:tiquitiltia%> Imperfect ; +tiquitiltia%%:tiquitilti%> Durative ; +tiquitiltia%%:tiquitilt%{i%}%{H%}%> Base2Suffixes ; +tiquitiltia%%:tiquitilti%> Base3Suffixes ; + +! bajar algo +timohuia%%:timohuia%> PresentTense ; +timohuia%%:timohuia%> Imperfect ; +timohuia%%:timohui%> Durative ; +timohuia%%:timohu%{i%}%{H%}%> Base2Suffixes ; +timohuia%%:timohui%> Base3Suffixes ; + +! robar +tlachtikilia%%:tlachtikilia%> PresentTense ; +tlachtikilia%%:tlachtikilia%> Imperfect ; +tlachtikilia%%:tlachtikili%> Durative ; +tlachtikilia%%:tlachtikil%{i%}%{H%}%> Base2Suffixes ; +tlachtikilia%%:tlachtikili%> Base3Suffixes ; + +! vender +tlanamakiltia%%:tlanamakiltia%> PresentTense ; +tlanamakiltia%%:tlanamakiltia%> Imperfect ; +tlanamakiltia%%:tlanamakilti%> Durative ; +tlanamakiltia%%:tlanamakilt%{i%}%{H%}%> Base2Suffixes ; +tlanamakiltia%%:tlanamakilti%> Base3Suffixes ; + +! adornar +tlahmachotia%%:tlahmachotia%> PresentTense ; +tlahmachotia%%:tlahmachotia%> Imperfect ; +tlahmachotia%%:tlahmachoti%> Durative ; +tlahmachotia%%:tlahmachot%{i%}%{H%}%> Base2Suffixes ; +tlahmachotia%%:tlahmachoti%> Base3Suffixes ; + +! ladrar +tlahtlawahtihtia%%:tlahtlawahtihtia%> PresentTense ; +tlahtlawahtihtia%%:tlahtlawahtihtia%> Imperfect ; +tlahtlawahtihtia%%:tlahtlawahtihti%> Durative ; +tlahtlawahtihtia%%:tlahtlawahtiht%{i%}%{H%}%> Base2Suffixes ; +tlahtlawahtihtia%%:tlahtlawahtihti%> Base3Suffixes ; + ! tomar/beber oni%%:oni%> PresentTense; oni%%:oni%> Imperfect; @@ -2893,6 +3005,13 @@ tlalilia%%:tlalilih%> Durative ; tlalilia%%:tlalil%{i%}%{H%}%> Base2Suffixes ; tlalilia%%:tlalili%> Base3Suffixes ; +! ponerle algo hacia dentro +pantlalilia%%:pantlalilia%> PresentTense ; +pantlalilia%%:pantlalilia%> Imperfect ; +pantlalilia%%:pantlalilih%> Durative ; +pantlalilia%%:pantlalil%{i%}%{H%}%> Base2Suffixes ; +pantlalilia%%:pantlalili%> Base3Suffixes ; + ! hacer algo por alguien chihuilia%%:chihuilia%> PresentTense ; chihuilia%%:chihuilia%> Imperfect ; @@ -3810,6 +3929,8 @@ tzocotzi:tzocotzi Adj ; !"pequeñx" patiyo:patiyo Adj ; !"carx" cualli:cualli Adj ; !"buenx" cuali:cuali Adj ; !"buenx" +cuali%:cuale Adj ; !"buenxs" + uhue:uhua Adj ; ! "difícil" ohue:ohue Adj ; ! "difícil"