diff --git a/lib/src/api/Browse.gf b/lib/src/api/Browse.gf index 223b4f0b2..960a123c3 100644 --- a/lib/src/api/Browse.gf +++ b/lib/src/api/Browse.gf @@ -1,4 +1,10 @@ -abstract Browse = Cat, Conjunction, Numeral, Structural, Lexicon ** { +abstract Browse = Cat, Numeral, Structural, Lexicon ** { + +cat ListAdv ; +cat ListAP ; +cat ListNP ; +cat ListRS ; +cat ListS ; fun mkAP_1 : A -> AP ; fun mkAP_2 : A -> NP -> AP ; @@ -287,4 +293,9 @@ fun that_Det_335 : Det ; fun this_Det_336 : Det ; fun those_Det_337 : Det ; fun these_Det_338 : Det ; +fun the_Det : Det ; +fun thePl_Det : Det ; +fun a_Det : Det ; +fun aPl_Det : Det ; + } diff --git a/lib/src/api/BrowseEng.gf b/lib/src/api/BrowseEng.gf index 89654121d..37e59d160 100644 --- a/lib/src/api/BrowseEng.gf +++ b/lib/src/api/BrowseEng.gf @@ -1,6 +1,12 @@ --# -path=.:alltenses -concrete BrowseEng of Browse = CatEng, ConjunctionEng, NumeralEng, LexiconEng, StructuralEng ** open LangEng in { +concrete BrowseEng of Browse = CatEng, NumeralEng, LexiconEng, StructuralEng ** open LangEng in { + +lincat ListAdv = LangEng.ListAdv ; +lincat ListAP = LangEng.ListAP ; +lincat ListNP = LangEng.ListNP ; +lincat ListRS = LangEng.ListRS ; +lincat ListS = LangEng.ListS ; lin mkAP_1 = PositA ; lin mkAP_2 = ComparA ; @@ -298,6 +304,11 @@ lin this_Det_336 = (DetQuant this_Quant NumSg) ; lin those_Det_337 = (DetQuant that_Quant NumPl) ; lin these_Det_338 = (DetQuant this_Quant NumPl) ; +lin the_Det = DetQuant DefArt NumSg ; +lin thePl_Det = DetQuant DefArt NumPl ; +lin a_Det = DetQuant IndefArt NumSg ; +lin aPl_Det = DetQuant IndefArt NumPl ; + oper ComplV2 : V2 -> NP -> VP = \v,np -> ComplSlash (SlashV2a v) np ; ComplV2A : V2A -> NP -> AP -> VP = \v,np,ap -> ComplSlash (SlashV2A v ap) np ; --# notminimal diff --git a/lib/src/api/Constructors.gf b/lib/src/api/Constructors.gf index 6dfe4728f..46c7d3657 100644 --- a/lib/src/api/Constructors.gf +++ b/lib/src/api/Constructors.gf @@ -429,6 +429,13 @@ incomplete resource Constructors = open Grammar in { mkDet : Pron -> Num -> Det -- 11. my (houses) --# notminimal } ; --# notminimal + + the_Det : Det ; -- the (house) + a_Det : Det ; -- a (house) + thePl_Det : Det ; -- the (houses) + aSg_Det : Det ; -- a (house) + aPl_Det : Det ; -- (houses) + --3 Quant, quantifiers --# notminimal -- There are definite and indefinite articles. @@ -1718,6 +1725,16 @@ incomplete resource Constructors = open Grammar in { those_QuantPl : QuantPl ; -- 5. those --# notminimal -} --# notminimal +-- new things + + the_Det : Det = theSg_Det ; -- the (house) + a_Det : Det = aSg_Det ; -- a (house) + theSg_Det : Det = DetQuant DefArt NumSg ; -- the (houses) + thePl_Det : Det = DetQuant DefArt NumPl ; -- the (houses) + aSg_Det : Det = DetQuant IndefArt NumSg ; -- a (house) + aPl_Det : Det = DetQuant IndefArt NumPl ; -- (houses) + + -- export needed, since not in Cat ListAdv : Type = Grammar.ListAdv ; --# notminimal