diff --git a/lib/doc/absfuns.html b/lib/doc/absfuns.html index bf1783f69..ed0842624 100644 --- a/lib/doc/absfuns.html +++ b/lib/doc/absfuns.html @@ -7,7 +7,7 @@

GF RGL Functions

generated by lib/src/doc/AbsFunFoc.hs
-20151015 +20151019

@@ -198,6 +198,76 @@ Functions in this table have links, e.g. Extensions +BaseAP +AP -> AP -> ListAP +red, white +head conj +Conjunction + + +BaseAdV +AdV -> AdV -> ListAdV +always, sometimes +head conj +Conjunction + + +BaseAdv +Adv -> Adv -> ListAdv +here, there +head conj +Conjunction + + +BaseCN +CN -> CN -> ListCN +man, woman +head conj +Conjunction + + +BaseIAdv +IAdv -> IAdv -> ListIAdv +where, when +head conj +Conjunction + + +BaseNP +NP -> NP -> ListNP +John, Mary +head conj +Conjunction + + +BaseRS +RS -> RS -> ListRS +who walks, whom I know +head conj +Conjunction + + +BaseS +S -> S -> ListS +John walks, Mary runs +head conj +Conjunction + + +BaseVPI +VPI -> VPI -> ListVPI +to walk, to run +- +Extensions + + +BaseVPS +VPS -> VPS -> ListVPS +walks, has run +- +Extensions + + ByVP VP -> Adv by publishing the document @@ -423,82 +493,152 @@ Functions in this table have links, e.g. -Conj -> [AP] -> AP +Conj -> ListAP -> AP cold and warm cc head Conjunction ConjAdV -Conj -> [AdV] -> AdV +Conj -> ListAdV -> AdV always or sometimes cc head Conjunction ConjAdv -Conj -> [Adv] -> Adv +Conj -> ListAdv -> Adv here or there cc head Conjunction ConjCN -Conj -> [CN] -> CN +Conj -> ListCN -> CN man and woman cc head Conjunction ConjDet -Conj -> [DAP] -> Det +Conj -> ListDAP -> Det his or her cc head Conjunction ConjIAdv -Conj -> [IAdv] -> IAdv +Conj -> ListIAdv -> IAdv where and with whom cc head Conjunction ConjNP -Conj -> [NP] -> NP +Conj -> ListNP -> NP she or we cc head Conjunction ConjRS -Conj -> [RS] -> RS +Conj -> ListRS -> RS who walks and whose mother runs cc head Conjunction ConjS -Conj -> [S] -> S +Conj -> ListS -> S he walks and she runs cc head Conjunction ConjVPI -Conj -> [VPI] -> VPI +Conj -> ListVPI -> VPI to walk and drink beer - Extensions ConjVPS -Conj -> [VPS] -> VPS +Conj -> ListVPS -> VPS had walked and drank beer - Extensions +ConsAP +AP -> ListAP -> ListAP +red, white, blue +head conj +Conjunction + + +ConsAdV +AdV -> ListAdV -> ListAdV +always, sometimes, never +head conj +Conjunction + + +ConsAdv +Adv -> ListAdv -> ListAdv +here, there, everywhere +head conj +Conjunction + + +ConsCN +CN -> ListCN -> ListCN +man, woman, child +head conj +Conjunction + + +ConsIAdv +IAdv -> ListIAdv -> ListIAdv +where, when, why +head conj +Conjunction + + +ConsNP +NP -> ListNP -> ListNP +John, Mary, Bill +head conj +Conjunction + + +ConsRS +RS -> ListRS -> ListRS +who wals, whom I know, who is here +head conj +Conjunction + + +ConsS +S -> ListS -> ListS +John walks, Mary runs, Bill swims +head conj +Conjunction + + +ConsVPI +VPI -> ListVPI -> ListVPI +to walk, to run, to stop +- +Extensions + + +ConsVPS +VPS -> ListVPS -> ListVPS +walks, has run, will stop +- +Extensions + + CountNP Det -> NP -> NP three of them, some of the boys @@ -936,7 +1076,7 @@ Functions in this table have links, e.g. NP -> V2 -> NP the man seen -- +head amod Noun @@ -1419,14 +1559,14 @@ Functions in this table have links, e.g. Phr -> Text -> Text Let's go! ... -- +head dep Text TFullStop Phr -> Text -> Text John walks. ... -- +head dep Text @@ -1454,7 +1594,7 @@ Functions in this table have links, e.g. Phr -> Text -> Text Are they here? ... -- +head dep Text diff --git a/lib/src/abstract/Conjunction.gf b/lib/src/abstract/Conjunction.gf index 44198b07e..6206847b0 100644 --- a/lib/src/abstract/Conjunction.gf +++ b/lib/src/abstract/Conjunction.gf @@ -17,15 +17,15 @@ abstract Conjunction = Cat ** { --2 Rules fun - ConjS : Conj -> [S] -> S ; -- he walks and she runs - ConjRS : Conj -> [RS] -> RS ; -- who walks and whose mother runs - ConjAP : Conj -> [AP] -> AP ; -- cold and warm - ConjNP : Conj -> [NP] -> NP ; -- she or we - ConjAdv : Conj -> [Adv] -> Adv ; -- here or there - ConjAdV : Conj -> [AdV] -> AdV ; -- always or sometimes - ConjIAdv : Conj -> [IAdv] -> IAdv ; -- where and with whom - ConjCN : Conj -> [CN] -> CN ; -- man and woman - ConjDet : Conj -> [DAP] -> Det ; -- his or her + ConjS : Conj -> ListS -> S ; -- he walks and she runs + ConjRS : Conj -> ListRS -> RS ; -- who walks and whose mother runs + ConjAP : Conj -> ListAP -> AP ; -- cold and warm + ConjNP : Conj -> ListNP -> NP ; -- she or we + ConjAdv : Conj -> ListAdv -> Adv ; -- here or there + ConjAdV : Conj -> ListAdV -> AdV ; -- always or sometimes + ConjIAdv : Conj -> ListIAdv -> IAdv ; -- where and with whom + ConjCN : Conj -> ListCN -> CN ; -- man and woman + ConjDet : Conj -> ListDAP -> Det ; -- his or her --2 Categories @@ -46,8 +46,37 @@ abstract Conjunction = Cat ** { -- The list constructors are derived from the list notation and therefore -- not given explicitly. But here are their type signatures: +{- +-- overview + BaseC : C -> C -> [C] ; --- for C = AdV, Adv, AP, CN, Det, IAdv, NP, RS, S + ConsC : C -> [C] -> [C] ; --- for C = AdV, Adv, AP, CN, Det, IAdv, NP, RS, S - -- BaseC : C -> C -> [C] ; -- for C = S, AP, NP, Adv - -- ConsC : C -> [C] -> [C] ; +-- complete list + + BaseAP : AP -> AP -> ListAP ; -- red, white + ConsAP : AP -> ListAP -> ListAP ; -- red, white, blue + + BaseAdV : AdV -> AdV -> ListAdV ; -- always, sometimes + ConsAdV : AdV -> ListAdV -> ListAdV ; -- always, sometimes, never + + BaseAdv : Adv -> Adv -> ListAdv ; -- here, there + ConsAdv : Adv -> ListAdv -> ListAdv ; -- here, there, everywhere + + BaseCN : CN -> CN -> ListCN ; -- man, woman + ConsCN : CN -> ListCN -> ListCN ; -- man, woman, child + + BaseIAdv : IAdv -> IAdv -> ListIAdv ; -- where, when + ConsIAdv : IAdv -> ListIAdv -> ListIAdv ; -- where, when, why + + BaseNP : NP -> NP -> ListNP ; -- John, Mary + ConsNP : NP -> ListNP -> ListNP ; -- John, Mary, Bill + + BaseRS : RS -> RS -> ListRS ; -- who walks, whom I know + ConsRS : RS -> ListRS -> ListRS ; -- who wals, whom I know, who is here + + BaseS : S -> S -> ListS ; -- John walks, Mary runs + ConsS : S -> ListS -> ListS ; -- John walks, Mary runs, Bill swims + +-} } diff --git a/lib/src/translator/Extensions.gf b/lib/src/translator/Extensions.gf index be1b1846c..f3c5804dd 100644 --- a/lib/src/translator/Extensions.gf +++ b/lib/src/translator/Extensions.gf @@ -13,19 +13,18 @@ cat [VPS] {2} ; fun - MkVPI : VP -> VPI ; -- to walk - ConjVPI : Conj -> [VPI] -> VPI ; -- to walk and drink beer - ComplVPIVV : VV -> VPI -> VP ; -- want to walk and drink beer + MkVPI : VP -> VPI ; -- to walk + ConjVPI : Conj -> ListVPI -> VPI ; -- to walk and drink beer + ComplVPIVV : VV -> VPI -> VP ; -- want to walk and drink beer - MkVPS : Temp -> Pol -> VP -> VPS ; -- had walked - ConjVPS : Conj -> [VPS] -> VPS ; -- had walked and drank beer - PredVPS : NP -> VPS -> S ; -- I had walked and drank beer + MkVPS : Temp -> Pol -> VP -> VPS ; -- had walked + ConjVPS : Conj -> ListVPS -> VPS ; -- had walked and drank beer + PredVPS : NP -> VPS -> S ; -- I had walked and drank beer ---- merge VPS and VPI ---- MkVPS, BaseVPS, ConsVPS, ConjVPS, PredVPS, ---- VPIForm, VPIInf, VPIPresPart, MkVPI, BaseVPI, ConsVPI, ConjVPI, ComplVPIVV, - -- generalizing Grammar PassVPSlash : VPSlash -> VP ; -- be forced to sleep @@ -95,6 +94,17 @@ fun FocusObjS : NP -> SSlash -> S ; -- this woman I love -- in declarative S, not in QS +{- +-- for documentation + + BaseVPI : VPI -> VPI -> ListVPI ; -- to walk, to run + ConsVPI : VPI -> ListVPI -> ListVPI ; -- to walk, to run, to stop + + BaseVPS : VPS -> VPS -> ListVPS ; -- walks, has run + ConsVPS : VPS -> ListVPS -> ListVPS ; -- walks, has run, will stop + +-} + } {- diff --git a/lib/src/uddeps.labels b/lib/src/uddeps.labels index 24a544c33..c2b08cfff 100644 --- a/lib/src/uddeps.labels +++ b/lib/src/uddeps.labels @@ -88,6 +88,7 @@ DetQuantOrd head nummod amod -- quite wrong; again for same reason as DetQu DetCN det head CountNP det head PredetNP det head +PPartNP head amod -- only in core RGL AdjCN amod head AdjDAP head amod @@ -150,3 +151,7 @@ PhrUtt cc head discourse PlusChunk head dep TTAnt empty empty head + +TExclMark head dep -- punctuation in the middle in these three +TFullStop head dep +TQuestMark head dep