diff --git a/lib/doc/AbsFunDoc.hs b/lib/doc/AbsFunDoc.hs
index 15d1f9010..6db6dc2b9 100644
--- a/lib/doc/AbsFunDoc.hs
+++ b/lib/doc/AbsFunDoc.hs
@@ -11,7 +11,7 @@ import Data.List
-- this creates the file absfuns.html
main = do
- system "grep \" : \" ../src/abstract/*.gf ../src/translator/Extensions.gf | grep \" -- \" >absfuns.tmp"
+ system "grep \" : \" ../src/abstract/*.gf ../src/translator/Extensions.gf ../../examples/app/App.gf | grep \" -- \" >absfuns.tmp"
funs <- readFile "absfuns.tmp" >>= return . lines
deps <- readFile "../src/uddeps.labels" >>= return . lines
let depmap = M.fromListWith (\x y -> x ++ [";"] ++ y) [(fun,deps) | fun:deps <- map words deps]
@@ -45,7 +45,12 @@ named f = f ++ "''''"
italics e = "//" ++ map (\c -> case c of '[' -> '(' ; ']'->')'; _ -> c) e ++ "//"
putStrLnIf = putStrLn
addLink fs =
- let m = last fs ; abstract = case m of "Extensions" -> "translator/" ; _ -> "abstract/"
+ let
+ m = last fs
+ abstract = case m of
+ "App" -> "../../examples/app/"
+ "Extensions" -> "translator/"
+ _ -> "abstract/"
in init fs ++ ["[" ++ m ++ " ../src/" ++ abstract ++ m ++ ".gf]"]
-- for tab separated generation
diff --git a/lib/doc/absfuns.html b/lib/doc/absfuns.html
index ed0842624..aae52d53c 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
-20151019
+20160605
@@ -436,6 +436,27 @@ Functions in this table have links, e.g. Question
+| ComplV2 |
+V2 -> NP -> VP |
+sees him |
+head dobj |
+App |
+
+
+| ComplV2V |
+V2V -> NP -> VP -> VP |
+forces him to leave |
+head dobj xcomp |
+App |
+
+
+| ComplV3 |
+V3 -> NP -> NP -> VP |
+gives him an apple |
+head iobj dobj ---- could be dobj dobj |
+App |
+
+
| ComplVA |
VA -> AP -> VP |
they become red |
@@ -1108,6 +1129,13 @@ Functions in this table have links, e.g. Verb
+| PassV2 |
+V2 -> VP |
+is seen |
+- |
+App |
+
+
| PassVPSlash |
VPSlash -> VP |
be forced to sleep |
@@ -1209,7 +1237,7 @@ Functions in this table have links, e.g.
NP -> VP -> Cl |
John walks |
-PassVPSlash nsubjpass head ; nsubj head |
+nsubj head |
Sentence |
@@ -1297,6 +1325,13 @@ Functions in this table have links, e.g. Question
+| QuestV2 |
+IP -> NP -> V2 -> QCl |
+whom does she see |
+dobj nsubj head |
+App |
+
+
| QuestVP |
IP -> VP -> QCl |
who walks |
@@ -1353,6 +1388,13 @@ Functions in this table have links, e.g. Relative
+| RelV2 |
+RP -> NP -> V2 -> RCl |
+that she sees |
+mark nsubj head |
+App |
+
+
| RelVP |
RP -> VP -> RCl |
who loves John |
diff --git a/lib/src/lang.labels b/lib/src/lang.labels
deleted file mode 100644
index 2f0b2f592..000000000
--- a/lib/src/lang.labels
+++ /dev/null
@@ -1,200 +0,0 @@
-PredVP nsubj head
-PredVPS nsubj head
-DirectComplVQ empty nsubj head ccomp -- Temp argument can only be empty in English
-DirectComplVS empty nsubj head ccomp -- Temp argument can only be empty in English
-SlashVP nsubj head
-SlashVS nsubj head ccomp
-FocusObjS nsubj head -- again might be wrong; more correct to call it dobj
-QuestIAdv advmod head -- "where does John sleep" cf. AdvVP
-QuestIComp head nsubj -- "where is John": John is clearly nsubj, but is where the head?
-QuestQVP nsubj head
-QuestSlash dobj head
-QuestVP nsubj head
-
-PredSCVP csubj head
-
-ComplSlash head dobj
-ComplSlashIP head dobj
-Slash3V3 head dobj
-SlashV2VNP head dobj xcomp
-PastPartAgentAP head dobj
-AdvQVP head dobj
-
-Slash2V3 head iobj
-
-ComplVS head ccomp
-ComplVQ head ccomp
-SlashV2S head ccomp
-SlashV2Q head ccomp
-CleftAdv head advcl -- not sure
-
-ComplVA head xcomp
-ComplVV head xcomp
-SlashVV head acl
-SlashV2A head xcomp
-SlashV2V head xcomp
-
-AdvNP head nmod -- not sure
-ExtAdvNP head nmod -- not sure
-PassAgentVPSlash head nmod -- not sure
-CleftNP head acl -- this cannot be nmod, not with type RS
-
-SSubjS head mark advcl
-RelS head advcl
-
-AdNum advmod head
-AdAP advmod head
-AdvAP head advmod
-ComparAdvAdj advmod amod head
-ComparAdvAdjS advmod amod head
-AdvIAdv advmod head
-AdVVP advmod head
-AdvVP head advmod
-ExtAdvVP head advmod
-AddAdvQVP head advmod
-AdVVPSlash advmod head
-AdvVPSlash head advmod
-AdvSlash head advmod
-ExistIPAdv head advmod
-AdvS advmod head
-ExtAdvS advmod head
-
-SubjS mark head
-RelVP mark head
-RelSlash mark head
-
-ComplN2 head nmod
-ComplN3 nmod head
-AdvCN head nmod
-PossNP nmod head
-PartNP nmod head
-ExistNPAdv head nmod
-
-OrdNumeralSuperl nummod head -- quite wrong; cannot find relevant details in the documentation; but most probably head lies outside the score of this function
-DetQuant head nummod -- quite wrong; I think the head lies outside the scope of the function
-CNNumNP head nummod
-
-ApposCN head appos
-ApposNP head appos
-
-RelNP head acl
-RelCN head acl
-SentCN head acl
-SentAP amod acl
-
-DetQuantOrd head nummod amod -- quite wrong; again for same reason as DetQuant function
-DetCN det head
-CountNP det head
-PredetNP det head
-PPartNP head amod -- only in core RGL
-
-AdjCN amod head
-AdjDAP head amod
-CAdvAP case amod head
-ComparA amod head
-ComplA2 amod head
-CompoundAP head amod
-AdAdV amod head
-AdAdv amod head
-
-CompoundN compound head
-
-IIDig head goeswith
-
-PrepNP case head
-PrepIP case head
-SlashPrep head case
-VPSlashPrep head case
-
-UttImpPl empty head
-UttImpPol empty head
-UttImpSg empty head
-
-MkVPS empty empty head
-
-UseCl empty empty head
-UseQCl empty empty head
-UseRCl empty empty head
-UseSlash empty empty head
-UseVC empty empty head
-
-BaseAP head conj
-BaseAdV head conj
-BaseAdv head conj
-BaseCN head conj
-BaseDAP head conj
-BaseIAdv head conj
-BaseNP head conj
-BaseRS head conj
-BaseS head conj
-ConsAP head conj
-ConsAdV head conj
-ConsAdv head conj
-ConsCN head conj
-ConsDAP head conj
-ConsIAdv head conj
-ConsNP head conj
-ConsRS head conj
-ConsS head conj
-ConjAP cc head
-ConjAdV cc head
-ConjAdv cc head
-ConjCN cc head
-ConjDet cc head
-ConjIAdv cc head
-ConjNP cc head
-ConjRS cc head
-ConjS cc head
-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
-
-A ADJ
-A2 ADJ
-AdA ADV
-AdN ADV
-AdV ADV
-Adv ADV
-CAdv ADV
-Card NUM
-Conj CONJ
-Det DET
-Digits NUM
-IAdv ADV
-IDet DET
-IP PRON
-Interj INTJ
-N NOUN
-N2 NOUN
-N3 NOUN
-Numeral NUM
-Ord NUM
-PConj CONJ
-PN PROPN
-Predet DET
-Prep ADP
-Pron PRON
-Punct PUNCT
-Quant DET
-RP PRON
-Subj SCONJ
-V VERB
-V2 VERB
-V2A VERB
-V2Q VERB
-V2S VERB
-V2V VERB
-V3 VERB
-VA VERB
-VQ VERB
-VS VERB
-VV VERB
-
-
-
-
diff --git a/lib/src/uddeps.labels b/lib/src/uddeps.labels
index c2b08cfff..dbee163b9 100644
--- a/lib/src/uddeps.labels
+++ b/lib/src/uddeps.labels
@@ -11,8 +11,6 @@ QuestQVP nsubj head
QuestSlash dobj head
QuestVP nsubj head
-PredVP PassVPSlash nsubjpass head
-
PredSCVP csubj head
ComplSlash head dobj
@@ -155,3 +153,54 @@ TTAnt empty empty head
TExclMark head dep -- punctuation in the middle in these three
TFullStop head dep
TQuestMark head dep
+
+ComplV2 head dobj -- shortcuts in App
+ComplV2V head dobj xcomp
+ComplV3 head iobj dobj ---- could be dobj dobj
+RelV2 mark nsubj head
+QuestV2 dobj nsubj head
+
+A ADJ
+A2 ADJ
+AdA ADV
+AdN ADV
+AdV ADV
+Adv ADV
+CAdv ADV
+Card NUM
+Conj CONJ
+Det DET
+Digits NUM
+IAdv ADV
+IDet DET
+IP PRON
+Interj INTJ
+N NOUN
+N2 NOUN
+N3 NOUN
+Numeral NUM
+Ord NUM
+PConj CONJ
+PN PROPN
+Predet DET
+Prep ADP
+Pron PRON
+Punct PUNCT
+Quant DET
+RP PRON
+Subj SCONJ
+V VERB
+V2 VERB
+V2A VERB
+V2Q VERB
+V2S VERB
+V2V VERB
+V3 VERB
+VA VERB
+VQ VERB
+VS VERB
+VV VERB
+
+
+
+