msyds/gf-core
1
0
Fork 0
forked from GitHub/gf-core
Code Pull Requests Activity

DocumentationFre completed with finite verb forms; missing notpresent tags added to DocumentationFin to make it compile with present

Browse Source
This commit is contained in:
aarne
2013-12-13 10:01:12 +00:00
parent fa1d995d08
commit 1554d160c2
3 changed files with 55 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
lib/src/finnish/DocumentationFin.gf
View File

@@ -148,14 +148,16 @@ lin
tr (th "mon.1" ++ gforms Pl P1 ++ tdf (vfin (ImperP1Pl))) ++
tr (th "mon.2" ++ gforms Pl P2 ++ tdf (vfin (Imper Pl))) ++
tr (th "mon.3" ++ gforms Pl P3 ++ tdf (vfin (ImperP3 Pl))) ++
tr (th "pass." ++ tdf (vfin (PassPresn True)) ++ tdf (vfin (PassImpf True)) ++
tdf (vfin (PassCondit True)) ++ tdf (vfin (PassPotent True)) ++ tdf (vfin (PassImper True))) ++
tr (th "kielt.yks." ++ tdf2 (vfin (Imper Sg)) ++ tdf (vfin (PastPartAct (AN (NCase Sg Nom)))) ++
tdf2 (vfin (Condit Sg P3)) ++ tdf2 (vfin (PotentNeg)) ++ tdf (vfin (Imper Sg))) ++
tr (th "pass." ++ tdf (vfin (PassPresn True)) ++ tdf (vfin (PassImpf True)) ++ --# notpresent
tdf (vfin (PassCondit True)) ++ tdf (vfin (PassPotent True)) ++ tdf (vfin (PassImper True))) ++ --# notpresent
tr (th "kielt.yks." ++ tdf2 (vfin (Imper Sg)) ++ tdf (vfin (PastPartAct (AN (NCase Sg Nom))))
++ tdf2 (vfin (Condit Sg P3)) ++ tdf2 (vfin (PotentNeg)) ++ tdf (vfin (Imper Sg)) --# notpresent
) ++
tr (th "kielt.mon." ++ tdf (vfin (PastPartAct (AN (NCase Pl Nom)))) ++
tdf (vfin (ImpNegPl))) ++
tr (th "kielt.pass." ++ tdf (vfin (PassPresn False)) ++ tdf (vfin (PassImpf False)) ++
tdf (vfin (PassCondit False)) ++ tdf (vfin (PassPotent False)) ++ tdf (vfin (PassImper False)))
tr (th "kielt.pass." ++ tdf (vfin (PassPresn False))
++ tdf (vfin (PassImpf False)) ++ tdf (vfin (PassCondit False)) ++ tdf (vfin (PassPotent False))--# notpresent
++ tdf (vfin (PassImper False)))
)
++
heading2 "nominaalimuodot" ++ ---

67
lib/src/french/DocumentationFre.gf
View File

@@ -37,7 +37,7 @@ lin
accusative_Parameter = mkN "accusativ" ;
imperative_Parameter = mkN "impératif" ;
indicative_Parameter = mkN "indikatif" ;
indicative_Parameter = mkN "indicatif" ;
conjunctive_Parameter = mkN "subjonctif" ;
infinitive_Parameter = mkN "infinitif" ;
@@ -78,32 +78,57 @@ lin
)
} ;
{-
InflectionV, InflectionV2 = \verb ->
let
vfin : VForm -> Str = \f ->
verb.s ! f ++ verb.prefix ;
vfin : VF -> Str = \f ->
verb.s ! f ;
gforms : Number -> Person -> Str = \n,p ->
tdf (vfin (VFin False (VPresInd n p))) ++
tdf (vfin (VFin False (VPresSubj n p)))
++ tdf (vfin (VFin False (VImpfInd n p))) --# notpresent
++ tdf (vfin (VFin False (VImpfSubj n p))) --# notpresent
tdf (vfin (VFin (VPres Indic) n p)) ++
tdf (vfin (VFin (VPres Conjunct) n p))
++ tdf (vfin (VFin (VImperf Indic) n p)) --# notpresent
++ tdf (vfin (VFin (VImperf Conjunct) n p)) --# notpresent
;
gforms2 : Number -> Person -> Str = \n,p -> --# notpresent
tdf (vfin (VFin VPasse n p)) ++ --# notpresent
tdf (vfin (VFin VFut n p)) ++ --# notpresent
tdf (vfin (VFin VCondit n p)) --# notpresent
; --# notpresent
ttable : (Number -> Person -> Str) -> Str -> Str = \forms, theadings ->
paragraph (frameTable (
theadings ++
tr (intagAttr "th" "rowspan=3" (heading singular_Parameter) ++
th "1.p" ++ forms Sg P1) ++
tr (th "2.p" ++ forms Sg P2) ++
tr (th "3.p" ++ forms Sg P3) ++
tr (intagAttr "th" "rowspan=3" (heading plural_Parameter) ++
th "1.p" ++ forms Pl P1) ++
tr (th "2.p" ++ forms Pl P2) ++
tr (th "3.p" ++ forms Pl P3)
)) ;
in {
s =
heading1 (heading verb_Category) ++
paragraph (frameTable (
tr (th "" ++ intagAttr "th" "colspan=2" (heading present_Parameter) ++ intagAttr "th" "colspan=2" (heading past_Parameter)) ++
tr (th "" ++ th (heading indicative_Parameter) ++ th (heading conjunctive_Parameter ++ "I") ++
th (heading indicative_Parameter) ++ th (heading conjunctive_Parameter ++ "II")) ++
tr (th "Sg.1" ++ gforms Sg P1) ++
tr (th "Sg.2" ++ gforms Sg P2) ++
tr (th "Sg.3" ++ gforms Sg P3) ++
tr (th "Pl.1" ++ gforms Pl P1) ++
tr (th "Pl.2" ++ gforms Pl P2) ++
tr (th "Pl.3" ++ gforms Pl P3)
)) ++
heading1 (heading verb_Category)
++ ttable gforms
(tr (intagAttr "th" "colspan=2 rowspan=2" ""
++ intagAttr "th" "colspan=2" (heading present_Parameter)
++ intagAttr "th" "colspan=2" (heading imperfect_Parameter)
) ++
tr ( th (heading indicative_Parameter) ++ th (heading conjunctive_Parameter)
++ th (heading indicative_Parameter) ++ th (heading conjunctive_Parameter)
)
)
++ ttable gforms2 --# notpresent
(tr (intagAttr "th" "colspan=2" "" ++ th "passé simple" ++ --# notpresent
th (heading future_Parameter) ++ th (heading conditional_Parameter))) --# notpresent
;
} ;
{-
paragraph (
frameTable (
tr (th (heading imperative_Parameter ++ "Sg.2") ++ tdf (vfin (VImper Sg))) ++

1
lib/src/french/ParseFre.gf
View File

@@ -15,6 +15,7 @@ concrete ParseFre of ParseEngAbs =
RelativeFre,
IdiomFre [NP, VP, Tense, Cl, ProgrVP, ExistNP, SelfAdvVP, SelfAdVVP, SelfNP],
ConstructionFre,
DocumentationFre,
ExtraFre [NP, Quant, VPSlash, VP, Tense, GenNP, PassVPSlash, PassAgentVPSlash,
Temp, Pol, Conj, VPS, ListVPS, S, Num, CN, RP, MkVPS, BaseVPS, ConsVPS, ConjVPS, PredVPS, GenRP,
VPI, VPIForm, VPIInf, VPIPresPart, ListVPI, VV, MkVPI, BaseVPI, ConsVPI, ConjVPI, ComplVPIVV,