GitHub/gf-core
1
0
Fork 1
mirror of https://github.com/GrammaticalFramework/gf-core.git synced 2026-05-22 09:32:53 -06:00
Code Issues Packages Projects Releases Wiki Activity

small changes in DocumentationFunctorEst and ConstructionEst

Browse Source
This commit is contained in:
inari
2014-10-17 14:52:49 +00:00
parent 54ad302e90
commit b47683c2da
2 changed files with 11 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
lib/src/estonian/ConstructionEst.gf
View File

@@ -1,4 +1,4 @@
--# -path=alltenses:.:../abstract --# -path=alltenses:.:../abstract:../api
concrete ConstructionEst of Construction = CatEst ** concrete ConstructionEst of Construction = CatEst **
open SyntaxEst, SymbolicEst, ParadigmsEst, (L = LexiconEst), (E = ExtraEst), (R = ResEst), Prelude in { open SyntaxEst, SymbolicEst, ParadigmsEst, (L = LexiconEst), (E = ExtraEst), (R = ResEst), Prelude in {
@@ -7,7 +7,9 @@ flags coding=utf8 ;
lin lin
hungry_VP = mkVP have_V2 (lin NP (mkNP (mkPN "kõht tühi"))) ; hungry_VP = mkVP have_V2 (lin NP (mkNP (mkPN "kõht tühi"))) ;
thirsty_VP = mkVP have_V2 (lin NP (mkNP (ParadigmsEst.mkN "janu"))) ; thirsty_VP = mkVP have_V2 (lin NP (mkNP (ParadigmsEst.mkN "janu"))) ;
has_age_VP card = mkVP (mkAP (lin AdA (mkUtt (lin NP (mkNP <lin Card card : Card> L.year_N)))) L.old_A) ; has_age_VP card =
let n_years_AdA : AdA = lin AdA (mkUtt (lin NP (mkNP <lin Card card : Card> L.year_N)))
in mkVP (mkAP n_years_AdA L.old_A) ;
have_name_Cl x y = mkCl (mkNP (E.GenNP x) L.name_N) (lin NP y) ; have_name_Cl x y = mkCl (mkNP (E.GenNP x) L.name_N) (lin NP y) ;
married_Cl x y = mkCl (mkNP and_Conj (lin NP x) (lin NP y)) (ParadigmsEst.mkAdv "abielus") ; married_Cl x y = mkCl (mkNP and_Conj (lin NP x) (lin NP y)) (ParadigmsEst.mkAdv "abielus") ;

19
lib/src/estonian/DocumentationEstFunctor.gf
View File

@@ -209,12 +209,9 @@ oper
++ th (heading passive_Parameter) --# notpresent ++ th (heading passive_Parameter) --# notpresent
) ++ ) ++
tr (th "1.p" ++ td "" ++ td (vfin ImperP1Pl) ++ tr (th "1.p" ++ td "" ++ td (vfin ImperP1Pl) ++
intagAttr "td" "rowspan=3" "TODO passive imperative") ++ intagAttr "td" "rowspan=3" (vfin ImperPass)) ++
tr (th "2.p" ++ td (vfin (Imper Sg)) ++ td (vfin (Imper Pl))) ++ tr (th "2.p" ++ td (vfin (Imper Sg)) ++ td (vfin (Imper Pl))) ++
tr (th "3.p" ++ td (vfin (ImperP3))) ++ tr (th "3.p" ++ td (vfin (ImperP3)) ++ td (vfin ImperP3))
tr (th (heading negative_Parameter) ++
td (vfin (Imper Sg)) ++
td (vfin ImpNegPl))
) ++ ) ++
heading2 (nounPluralHeading nominal_form_ParameterType).s ++ heading2 (nounPluralHeading nominal_form_ParameterType).s ++
heading3 (heading infinitive_Parameter) ++ heading3 (heading infinitive_Parameter) ++
@@ -223,16 +220,12 @@ oper
th (heading nominative_Parameter) ++ td (vfin (Inf InfDa))) ++ th (heading nominative_Parameter) ++ td (vfin (Inf InfDa))) ++
tr (th (heading inessive_Parameter) ++ td (vfin (Inf InfDes))) ++ tr (th (heading inessive_Parameter) ++ td (vfin (Inf InfDes))) ++
tr (intagAttr "th" "rowspan=6" "ma" ++ tr (intagAttr "th" "rowspan=5" "ma" ++
th (heading inessive_Parameter) ++ td (vfin (Inf InfMas))) ++ th (heading illative_Parameter) ++ td (vfin (Inf InfMa))) ++
tr (th (heading inessive_Parameter) ++ td (vfin (Inf InfMas))) ++
tr (th (heading elative_Parameter) ++ td (vfin (Inf InfMast))) ++ tr (th (heading elative_Parameter) ++ td (vfin (Inf InfMast))) ++
tr (th (heading illative_Parameter) ++ td (vfin (Inf InfMa))) ++
tr (th (heading abessive_Parameter) ++ td (vfin (Inf InfMata))) ++ tr (th (heading abessive_Parameter) ++ td (vfin (Inf InfMata))) ++
tr (th (heading adessive_Parameter) ++ td "TODO InfMa adessive") ++ tr (th (heading translative_Parameter) ++ td (vfin (Inf InfMaks)))
tr (th (heading translative_Parameter) ++ td (vfin (Inf InfMaks))) ++
tr (intagAttr "th" "rowspan=2" "mine" ++
th (heading nominative_Parameter) ++ td "TODO mine") ++
tr (th (heading partitive_Parameter) ++ td "TODO mist")
) ++ ) ++
heading3 (heading participle_Parameter) ++ heading3 (heading participle_Parameter) ++