diff --git a/src/rukiga/NounCgg.gf b/src/rukiga/NounCgg.gf index 991969bd6..b4f4f169c 100755 --- a/src/rukiga/NounCgg.gf +++ b/src/rukiga/NounCgg.gf @@ -72,9 +72,9 @@ lin accS = np.s ! Acc; in case of { - => {s = \\_ =>nomS ++ mkPredetPref a ++ Predef.BIND ++ predet.s ; agr = a}; - => {s = \\_ =>nomS ++ mkPredetPref a ++ Predef.BIND ++ predet.s ++ - mkPredetPref a ++ Predef.BIND ++ predet.s2; agr = a}; + => {s = \\_ =>nomS ++ mkPredetPref a ++ predet.s ; agr = a}; + => {s = \\_ =>nomS ++ mkPredetPref a ++ predet.s ++ + mkPredetPref a ++ predet.s2; agr = a}; => {s = \\_ =>nomS ++ predet.s ; agr = a}; => {s = \\_ =>nomS ++ predet.s ++ predet.s2; agr = a} -- never seen this case }; @@ -92,7 +92,10 @@ lin -- The determiner has a fine-grained structure, in which a 'nucleus' -- quantifier and an optional numeral can be discerned. --DetQuant : Quant -> Num -> Det ; -- these five - DetQuant quant num = {s=[]; s2 = quant.s2; ntype = Incomplete; num = num.n; pos=PreDeterminer; doesAgree = quant.doesAgree}; -- + DetQuant quant num = case quant.isPron of { + True => {s=[]; s2 = quant.s2; ntype = Incomplete; num = num.n; pos=PreDeterminer; doesAgree = quant.doesAgree}; + False => {s= quant.s.s ! Nom; s2 =\\_ =>[]; ntype = Incomplete; num = num.n; pos=PreDeterminer; doesAgree = quant.doesAgree} -- + }; --DetQuantOrd : Quant -> Num -> Ord -> Det ; -- these five best DetQuantOrd quant num ord = { diff --git a/src/rukiga/PhraseCgg.gf b/src/rukiga/PhraseCgg.gf index d8c7aa2a1..7e2459edd 100755 --- a/src/rukiga/PhraseCgg.gf +++ b/src/rukiga/PhraseCgg.gf @@ -20,6 +20,13 @@ lin Neg => (mkSubjClitic (AgMUBAP2 Sg)) ++ imp.s!ImpNeg } };--: Pol -> Imp -> Utt ; -- (do not) walk ----s + --UttImpPl : Pol -> Imp -> Utt ; -- (don't) love yourselves + UttImpPl pol imp ={s = + case pol.p of { + Pos => imp.s!ImpPos; + Neg => (mkSubjClitic (AgMUBAP2 Pl)) ++ imp.s!ImpNeg + } + }; {- --1 Phrase: Phrases and Utterances diff --git a/src/rukiga/StructuralCgg.gf b/src/rukiga/StructuralCgg.gf index 770dc23e5..300d750be 100755 --- a/src/rukiga/StructuralCgg.gf +++ b/src/rukiga/StructuralCgg.gf @@ -218,6 +218,8 @@ lin so_AdA = {s="munônga"; position1=Post};--: AdA ; too_AdA = {s="munônga"; position1=Post}; --: AdA ; very_AdA = {s="munônga"; position1=Post}; --: AdA ; + + please_Voc = ss ", nyabura we"; --: Voc ; {- --1 Structural: Structural Words --