commit ae9befc8ce5ba281ba60b5f48b502c44553133fb Author: ruthenian8 Date: Thu Aug 12 01:23:23 2021 +0300 refining tests diff --git a/merged.lexd b/merged.lexd index 89f67ec..9d14789 100644 --- a/merged.lexd +++ b/merged.lexd @@ -164,11 +164,13 @@ DaSuffixedNums OblAdjSingular[OblNLi] DaSuffixedNums OblAdjPlural[OblPlLi] PATTERN OrdNumbersSer1 -decLinks? singles ordinalOpt? ordinal[ser1] +singles ordinalOpt? ordinal[ser1] +decLinks singles ordinalOpt? ordinal[ser1] DaSuffixedNums ordinalOpt? ordinal[ser1] PATTERN OrdNumbersSer2 -decLinks? singles ordinalOpt ordinal[ser2] +singles ordinalOpt ordinal[ser2] +decLinks singles ordinalOpt ordinal[ser2] DaSuffixedNums ordinalOpt ordinal[ser2] # ---------------------------------------------------------------------------------------------- @@ -367,11 +369,12 @@ adjSingle OblAdjSup NCl? # PerPronounStems genitiveCase[GenAgr] NCl? PerPronounStems[PrExc] [:] CaseMain[ErgR,-RegErg,-nullNom] NCl? -PerPronounStems[PrExc] DatExcMin[pron] NCl? -PerPronounStems[PrExc] SupExcMin[pron] NCl? -PerPronounStems[-PrExc] CaseMain[ErgR] NCl? +PerPronounStems[PrExc] [:] DatExcMin[pron] NCl? +PerPronounStems[PrExc] [:] SupExcMin[pron] NCl? +PerPronounStems[-PrExc] CaseMain[nullNom] NCl? +PerPronounStems[-PrExc] [:] CaseMain[ErgR,-nullNom] NCl? PerPronounExc NCl? -PerPronounStems locMain directCase NCl? +PerPronounStems [:] locMain directCase NCl? # #demonstrative pronouns # @@ -543,7 +546,7 @@ NounPlBi[hpl] NoVbiPl aPlusHpl ( AddCasesHpl | CasesGenAgr ) NCl? # NounPlZabi PlMarker[plZabi] aPlusHpl ( AddCasesHpl | CasesGenAgr ) NCl? #zabi adi & ari only used in animate nouns, see Kibrik 132 NounPlAdi PlMarker[plAdi] PlOblMarker[hpl] ( AddCasesHpl | CasesGenAgr ) NCl? -NounPlAri PlMarker[plAri] aPlusHpl ( AddCasesHpl | CasesGenAgr ) NCl? +NounPlAri PlMarker[plAri] OblPlural[OblPlU] ( AddCasesHpl | CasesGenAgr ) NCl? # NounPlDari[hpl] PlMarker[plDari] aPlusHpl ( AddCasesHpl | CasesGenAgr ) NCl? NounPlBadi[hpl] PlMarker[plBadi] PlOblMarker[hpl] ( AddCasesHpl | CasesGenAgr ) NCl? @@ -1065,7 +1068,7 @@ LEXICON IrrCvb # LEXICON rootOne # 1 цеб:це[norm] -цеб:цеце[red] +цеб:цеце[red] цеб:гьечӀисес[ord] LEXICON rootInit @@ -1202,11 +1205,11 @@ LEXICON IndefPronounSuffix :гӀагила LEXICON AltIndefPronounSuffix -:вукӀавола[Msg] -:йукӀайола[Fsg] +:вукӀавола[Msg] +:йукӀайола[Fsg] :букӀабола[Nsg] -:букӀурола[Hpl] -:рукӀарола[Npl] +:букӀурола[Hpl] +:рукӀарола[Npl] LEXICON RefSuffix :да diff --git a/merged.tr.hfstol b/merged.tr.hfstol index c7f5c74..56d3f90 100644 Binary files a/merged.tr.hfstol and b/merged.tr.hfstol differ diff --git a/merged.twol b/merged.twol index d10e7a0..6fef4f1 100644 --- a/merged.twol +++ b/merged.twol @@ -65,7 +65,7 @@ X:0 <=> _ ( ᵸ:0 ) ( %>: ) ( %{ᵸ%}: ) V|%{prt%}; where X in reps; %{ᵸ%}:н <=> _ ( %>: ) [с|ч|л|?:0 в]; "nasalization deletion" -ᵸ:0 <=> _ ( %>: ) [ V | ?* ncons:* ]; +ᵸ:0 <=> _ %>: [ V | ?* ncons:* ]; "Р after nasalized vowels" %{р%}:н <=> ᵸ:0 [ ? | ?^2 | ?^3 ] _; diff --git a/tests.csv b/tests.csv index a0c02fc..8eb3e65 100644 --- a/tests.csv +++ b/tests.csv @@ -30,8 +30,8 @@ analysis,form,mustpass,source,page,description гьакьуда,гьакьудалъоб,pass,Kibrik,159,ordinal without -la- infix цеб<*>бешенда,бешендалалъоб,pass,Kibrik,159,ordinal цеб<*>азарда,азардалалъоб,pass,Kibrik,159,ordinal -цеб<*>гьацӀаиᵸщтуда,гьацӀалинщтуралалъоб,pass,Kibrik,159,ordinal complex -гьакьуда,гьакьудалалъобщур,pass,Kibrik,159,ordinal oblique case +цеб<*>гьацӀаиᵸщтуда,гьацӀалиᵸщтуралалъоб,pass,Kibrik,159,ordinal complex +гьакьуда,гьакьудалалъоблъир,pass,Kibrik,159,ordinal oblique case гьабда,гьабдигьабда,pass,Kibrik,158,regular distributional numeral де<1P>,де,pass,Kibrik,161,per.pronoun 1 person absolutive де<1P>,ден,pass,Kibrik,161,per.pronoun 1 person oblique @@ -63,8 +63,8 @@ analysis,form,mustpass,source,page,description об<3P>,ощур,pass,Kibrik,162,demonstratives уб<3P>,ув,pass,Kibrik,162,demonstratives уб<3P>,ущур,pass,Kibrik,162,demonstratives -угьуб<3P>,угьуб,pass,Kibrik,162,demonstratives -угьуб<3P>,угьущур,pass,Kibrik,162,demonstratives +угьуб<3P>,угьув,pass,Kibrik,162,demonstratives +угьуб<3P>,угьувщур,pass,Kibrik,162,demonstratives об<3P>,обе,pass,Kibrik,161,adverbial pronoun угьуб<3P>,угьубе,pass,Kibrik,161,adverbial pronoun аб<3P>,агьибе,pass,Kibrik,161,adverbial pronoun @@ -98,8 +98,6 @@ analysis,form,mustpass,source,page,description эб,эррукӀарола,pass,Kibrik,165,indef.pronoun ser2 Msg эб,эмгӀагила,pass,Kibrik,166,univ.pronoun absolutive эб,эмгӀагилащур,pass,Kibrik,166,univ.pronoun Msg oblique -эб,эмгӀагилалъир,pass,Kibrik,166,univ.pronoun Nsg oblique -эб,эмгӀагилалъир,pass,Kibrik,166,univ.pronoun Npl oblique эбеб,эвев,pass,Kibrik,167,"Each" pronoun MSG absolutive эбеб,эйей,pass,Kibrik,167,"Each" pronoun FSG absolutive эбеб,эбеб,pass,Kibrik,167,"Each" pronoun NSG absolutive @@ -206,7 +204,7 @@ analysis,form,mustpass,source,page,description ашти,аштирлъир,pass,Kibrik,90,Masdar oblique ракъиᵸ,ракъин,pass,Kibrik,90,Masdar for nasalized, absolutive ашти,аштичӀир,pass,Kibrik,91,Neg. Masdar -ашти,аштичӀилъир,pass,Kibrik,91,Neg. Masdar +ашти,аштичӀирлъир,pass,Kibrik,91,Neg. Masdar ракъиᵸ,ракъинчӀир,pass,Kibrik,91,Neg.Masdar for nasalized, absolutive ашти,аштирадачӀир,pass,Kibrik,95,Emphatetic Neg. Masdar ашти,аштирадачӀирлъир,pass,Kibrik,95,Emphatetic Neg. Masdar @@ -229,7 +227,7 @@ analysis,form,mustpass,source,page,description бежун,бежванр,pass,Kibrik,130,Noun + (n alt) oblique бежун,бежванлъ,pass,Kibrik,130,Noun + (n alt) genitive муч,мучулар,pass,Kibrik,132,Noun (irreg) oblique -муч,мучулалъ,pass,Kibrik,132,Noun (irreg) genitive +муч,мучулалъ,pass,Kibrik,132,Noun (irreg) genitive акушерка,акушеркаби,pass,Kibrik,132,Animate noun + (bi) plural absolutive акушерка,акушеркабалур,pass,Kibrik,133,Animate noun + (bi) plural oblique акушерка,акушеркабалуб,pass,Kibrik,133,Animate noun + (bi) plural genitive