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

completed DocumentationFre, also added Cl examples to V's

Browse Source
This commit is contained in:
aarne
2013-12-13 12:50:09 +00:00
parent 4ac0369e1a
commit a1d641ea4a
2 changed files with 37 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
lib/src/abstract/Documentation.gf
View File

@@ -75,6 +75,9 @@ fun
superlative_Parameter : Parameter ; superlative_Parameter : Parameter ;
predicative_Parameter : Parameter ; predicative_Parameter : Parameter ;
subject_Parameter : Parameter ;
object_Parameter : Parameter ;
person1_Parameter : Parameter ; person1_Parameter : Parameter ;
person2_Parameter : Parameter ; person2_Parameter : Parameter ;
person3_Parameter : Parameter ; person3_Parameter : Parameter ;
@@ -88,12 +91,14 @@ fun
InflectionA : A -> Inflection ; InflectionA : A -> Inflection ;
InflectionV : V -> Inflection ; InflectionV : V -> Inflection ;
InflectionV2 : V2 -> Inflection ; InflectionV2 : V2 -> Inflection ;
InflectionVV : VV -> Inflection ;
-- generic grammar terms -- generic grammar terms
formGr_N : N ; -- inflectional form exampleGr_N : N ; -- example of a rule, category, etc
shortGr_A : A ; -- short form of e.g. a Fin infinitive, or short vowel (may have to be split) formGr_N : N ; -- inflectional form
longGr_A : A ; -- long form of e.g. a Fin infinitive, or long vowel (may have to be split) shortGr_A : A ; -- short form of e.g. a Fin infinitive, or short vowel (may have to be split)
longGr_A : A ; -- long form of e.g. a Fin infinitive, or long vowel (may have to be split)
} }

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

@@ -5,6 +5,8 @@ concrete DocumentationFre of Documentation = CatFre ** open
CommonRomance, CommonRomance,
ParadigmsFre, ParadigmsFre,
(G = GrammarFre), (G = GrammarFre),
(S = SyntaxFre),
(L = LexiconFre),
Prelude, Prelude,
HTML HTML
in { in {
@@ -61,9 +63,17 @@ lin
oper oper
tdf : Str -> Str = \s -> td (intag "i" s) ; tdf : Str -> Str = \s -> td (intag "i" s) ;
heading : N -> Str = \n -> (nounHeading n).s ; heading : N -> Str = \n -> (nounHeading n).s ;
nounGender : N -> Parameter = \n -> case n.g of {
Masc => masculine_Parameter ;
Fem => feminine_Parameter
} ;
lin lin
InflectionN noun = { InflectionN noun = {
s = heading1 (heading noun_Category) ++ frameTable ( s = heading1 (heading noun_Category) ++
heading (nounGender noun) ++
frameTable (
tr (th (heading singular_Parameter) ++ th (heading plural_Parameter) ) ++ tr (th (heading singular_Parameter) ++ th (heading plural_Parameter) ) ++
tr (tdf (noun.s ! Sg) ++ tdf (noun.s ! Pl)) tr (tdf (noun.s ! Sg) ++ tdf (noun.s ! Pl))
) )
@@ -78,7 +88,12 @@ lin
) )
} ; } ;
InflectionV, InflectionV2 = \verb -> InflectionV v = inflectionVerb (S.mkUtt (S.mkCl S.she_NP (lin V v))).s v ;
InflectionV2 v = inflectionVerb (S.mkUtt (S.mkCl S.she_NP (lin V2 v) S.something_NP)).s (lin V v) ;
InflectionVV v = inflectionVerb (S.mkUtt (S.mkCl S.she_NP (lin VV v) (S.mkVP (L.sleep_V)))).s (lin V v) ;
oper
inflectionVerb : Str -> V -> {s : Str} = \ex,verb ->
let let
vfin : VF -> Str = \f -> vfin : VF -> Str = \f ->
verb.s ! f ; verb.s ! f ;
@@ -112,6 +127,7 @@ lin
in { in {
s = s =
heading1 (heading verb_Category) heading1 (heading verb_Category)
++ paragraph (intag "b" "exemple :" ++ intag "i" ex)
++ ttable gforms ++ ttable gforms
(tr (intagAttr "th" "colspan=2 rowspan=2" "" (tr (intagAttr "th" "colspan=2 rowspan=2" ""
++ intagAttr "th" "colspan=2" (heading present_Parameter) ++ intagAttr "th" "colspan=2" (heading present_Parameter)
@@ -124,21 +140,17 @@ lin
++ ttable gforms2 --# notpresent ++ ttable gforms2 --# notpresent
(tr (intagAttr "th" "colspan=2" "" ++ th "passé simple" ++ --# notpresent (tr (intagAttr "th" "colspan=2" "" ++ th "passé simple" ++ --# notpresent
th (heading future_Parameter) ++ th (heading conditional_Parameter))) --# notpresent th (heading future_Parameter) ++ th (heading conditional_Parameter))) --# notpresent
;
} ;
++ paragraph (frameTable (
{- tr (intagAttr "th" "colspan=2" (heading infinitive_Parameter) ++ (tdf (vfin (VInfin False)))) ++
paragraph ( tr (intagAttr "th" "rowspan=3" (heading imperative_Parameter) ++ th "sg.2.p" ++ (tdf (vfin (VImper SgP2)))) ++
frameTable ( tr ( th "pl.1.p" ++ (tdf (vfin (VImper PlP1)))) ++
tr (th (heading imperative_Parameter ++ "Sg.2") ++ tdf (vfin (VImper Sg))) ++ tr ( th "pl.2.p" ++ (tdf (vfin (VImper PlP2)))) ++
tr (th (heading imperative_Parameter ++ "Pl.2") ++ tdf (vfin (VImper Pl))) ++ tr (intagAttr "th" "rowspan=2" (heading participle_Parameter) ++
tr (th (heading infinitive_Parameter) ++ tdf (verb.s ! (VInf False))) ++ th (heading past_Parameter) ++ (tdf (vfin (VPart Masc Sg)))) ++
tr (th (heading present_Parameter ++ heading participle_Parameter) ++ tdf (verb.s ! (VPresPart APred))) ++ tr ( th (heading present_Parameter) ++ (tdf (vfin VGer)))
tr (th (heading perfect_Parameter ++ heading participle_Parameter) ++ tdf (verb.s ! (VPastPart APred))) ++ )
tr (th (heading aux_verb_Parameter) ++ td (intag "i" (case verb.aux of {VHaben => "haben" ; VSein => "sein"}))) )
))
} ; } ;
-}
} }