diff --git a/resource-0.6/english/StructuralEng.gf b/resource-0.6/english/StructuralEng.gf index 6b64dadf5..261d65fa0 100644 --- a/resource-0.6/english/StructuralEng.gf +++ b/resource-0.6/english/StructuralEng.gf @@ -39,8 +39,8 @@ concrete StructuralEng of Structural = ThisNP = nameNounPhrase (nameReg "this") ; ThatNP = nameNounPhrase (nameReg "that") ; - TheseNumNP n = nameNounPhrase {s = \\c => "these" ++ n.s ! c} ; --- Pl; Gen! - ThoseNumNP n = nameNounPhrase {s = \\c => "those" ++ n.s ! c} ; --- Pl; Gen! + TheseNumNP n = nameNounPhrasePl {s = \\c => "these" ++ n.s ! c} ; + ThoseNumNP n = nameNounPhrasePl {s = \\c => "those" ++ n.s ! c} ; EverybodyNP = nameNounPhrase (nameReg "everybody") ; SomebodyNP = nameNounPhrase (nameReg "somebody") ; diff --git a/resource-0.6/english/SyntaxEng.gf b/resource-0.6/english/SyntaxEng.gf index 6bd0ddb82..408acd3cd 100644 --- a/resource-0.6/english/SyntaxEng.gf +++ b/resource-0.6/english/SyntaxEng.gf @@ -47,6 +47,9 @@ oper nameNounPhrase : ProperName -> NounPhrase = \john -> {s = \\c => john.s ! toCase c ; n = Sg ; p = P3} ; + nameNounPhrasePl : ProperName -> NounPhrase = \john -> + {s = \\c => john.s ! toCase c ; n = Pl ; p = P3} ; + -- The following construction has to be refined for genitive forms: -- "we two", "us two" are OK, but "our two" is not. diff --git a/resource-0.6/shallow/Shallow.gf b/resource-0.6/shallow/Shallow.gf index c066c060a..c66804fa2 100644 --- a/resource-0.6/shallow/Shallow.gf +++ b/resource-0.6/shallow/Shallow.gf @@ -23,6 +23,9 @@ abstract Shallow = { Verb ; TV ; Adj ; + AdjDeg ; ---- + Adj2 ; ---- + V3 ; ---- N ; Noun ; CN ; diff --git a/resource-0.6/shallow/ShallowI.gf b/resource-0.6/shallow/ShallowI.gf index eded46819..d0c384fe4 100644 --- a/resource-0.6/shallow/ShallowI.gf +++ b/resource-0.6/shallow/ShallowI.gf @@ -18,6 +18,9 @@ incomplete concrete ShallowI of Shallow = open (Resource = Resource) in { Det = Resource.Det ; Prep = Resource.Prep ; Num = Resource.Num ; + AdjDeg = Resource.AdjDeg ; + Adj2 = Resource.Adj2 ; + V3 = Resource.V3 ; lin PhrS = Resource.IndicPhrase ;