diff --git a/lib/doc/AbsFunDoc.hs b/lib/doc/AbsFunDoc.hs
index 55656836c..15d1f9010 100644
--- a/lib/doc/AbsFunDoc.hs
+++ b/lib/doc/AbsFunDoc.hs
@@ -11,10 +11,10 @@ import Data.List
-- this creates the file absfuns.html
main = do
- system "grep \" : \" ../src/abstract/*.gf ../src/translator/Extensions.gf >absfuns.tmp"
+ system "grep \" : \" ../src/abstract/*.gf ../src/translator/Extensions.gf | grep \" -- \" >absfuns.tmp"
funs <- readFile "absfuns.tmp" >>= return . lines
deps <- readFile "../src/uddeps.labels" >>= return . lines
- let depmap = M.fromList [(fun,deps) | fun:deps <- map words deps]
+ let depmap = M.fromListWith (\x y -> x ++ [";"] ++ y) [(fun,deps) | fun:deps <- map words deps]
let rows = sort $ filter (flip S.notMember hiddenModules . last) $ map (mkRow depmap) (map words funs)
let entries = map (sepFields . addLink) rows
putStrLnIf $ "GF RGL Functions"
@@ -27,7 +27,7 @@ main = do
hiddenModules = S.fromList
- ["Backward","Structural","Extra","Construction","Compatibility",
+ ["Backward","Structural","Extra","Compatibility",
"Documentation","Lexicon","NumeralTransfer","Terminology","Transfer","MarkHTML","Markup","ERROR"] ----
mkRow depmap ws = case ws of
diff --git a/lib/doc/absfuns.html b/lib/doc/absfuns.html
index 0348215ab..bf1783f69 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
-20151014
+20151015
@@ -772,6 +772,13 @@ Functions in this table have links, e.g. Idiom
+| InLanguage |
+Language -> Adv |
+in English, auf englisch, englanniksi, etc |
+- |
+Construction |
+
+
| InOrderToVP |
VP -> Adv |
(in order) to publish the document |
@@ -1062,7 +1069,7 @@ Functions in this table have links, e.g.
NP -> VP -> Cl |
John walks |
-PassVPSlash nsubjpass head |
+PassVPSlash nsubjpass head ; nsubj head |
Sentence |
@@ -1703,6 +1710,146 @@ Functions in this table have links, e.g. Extensions
+| dayMonthAdv |
+Monthday -> Month -> Adv |
+on 17 May |
+- |
+Construction |
+
+
+| dayMonthYearAdv |
+Monthday -> Month -> Year -> Adv |
+on 17 May 2013 |
+- |
+Construction |
+
+
+| has_age_VP |
+Card -> VP |
+x is y years old / x a y ans (Fre) |
+- |
+Construction |
+
+
+| have_name_Cl |
+NP -> NP -> Cl |
+x's name is y / x s'appelle y (Fre) |
+- |
+Construction |
+
+
+| how_far_QCl |
+NP -> QCl |
+how far is x / quanto dista x (Ita) |
+- |
+Construction |
+
+
+| how_old_QCl |
+NP -> QCl |
+how old is x / quanti anni ha x (Ita) |
+- |
+Construction |
+
+
+| hungry_VP |
+VP |
+x is hungry / x a faim (Fre) |
+- |
+Construction |
+
+
+| intMonthday |
+Int -> Monthday |
+31th (March) |
+- |
+Construction |
+
+
+| intYear |
+Int -> Year |
+(year) 1963 |
+- |
+Construction |
+
+
+| is_right_VP |
+VP |
+he is right / il a raison (Fre) |
+- |
+Construction |
+
+
+| is_wrong_VP |
+VP |
+he is wrong / han har fel (Swe) |
+- |
+Construction |
+
+
+| languageCN |
+Language -> CN |
+(my) French |
+- |
+Construction |
+
+
+| languageNP |
+Language -> NP |
+French (is easy) |
+- |
+Construction |
+
+
+| married_Cl |
+NP -> NP -> Cl |
+x is married to y / x on naimisissa y:n kanssa (Fin) |
+- |
+Construction |
+
+
+| monthAdv |
+Month -> Adv |
+in June |
+- |
+Construction |
+
+
+| monthN |
+Month -> N |
+(this) November |
+- |
+Construction |
+
+
+| monthPN |
+Month -> PN |
+March (is cold) |
+- |
+Construction |
+
+
+| monthYearAdv |
+Month -> Year -> Adv |
+in May 2013 |
+- |
+Construction |
+
+
+| n_units_AP |
+Card -> CN -> A -> AP |
+x inches long |
+- |
+Construction |
+
+
+| n_units_of_NP |
+Card -> CN -> NP -> NP |
+x ounces of this flour |
+- |
+Construction |
+
+
| num |
Sub1000000 -> Numeral |
123456 (coercion to top category) |
@@ -1815,12 +1962,89 @@ Functions in this table have links, e.g. Extensions
+| thirsty_VP |
+VP |
+x is thirsty / x a soif (Fre) |
+- |
+Construction |
+
+
+| timeunitAdv |
+Card -> Timeunit -> Adv |
+(for) three hours |
+- |
+Construction |
+
+
+| weather_adjCl |
+AP -> Cl |
+it is warm / il fait chaud (Fre) |
+- |
+Construction |
+
+
+| weekdayHabitualAdv |
+Weekday -> Adv |
+on Mondays |
+- |
+Construction |
+
+
+| weekdayLastAdv |
+Weekday -> Adv |
+last Monday |
+- |
+Construction |
+
+
+| weekdayN |
+Weekday -> N |
+(this) Monday |
+- |
+Construction |
+
+
+| weekdayNextAdv |
+Weekday -> Adv |
+next Monday |
+- |
+Construction |
+
+
+| weekdayPN |
+Weekday -> PN |
+Monday (is free) |
+- |
+Construction |
+
+
+| weekdayPunctualAdv |
+Weekday -> Adv |
+on Monday |
+- |
+Construction |
+
+
+| what_name_QCl |
+NP -> QCl |
+what is x's name / wie heisst x (Ger) |
+- |
+Construction |
+
+
| who_RP |
RP |
who (relative pronoun) |
- |
Extensions |
+
+| yearAdv |
+Year -> Adv |
+in 1976 |
+- |
+Construction |
+