From 600b660476ed4acbb113c6fba56ab868d47fcf8f Mon Sep 17 00:00:00 2001 From: aarne Date: Fri, 6 Jun 2014 14:30:25 +0000 Subject: [PATCH] completed DocumentationDut --- lib/src/abstract/Terminology.gf | 1 + lib/src/dutch/DocumentationDutFunctor.gf | 79 +++++++++++------------- lib/src/dutch/LangDut.gf | 2 +- lib/src/dutch/TerminologyDut.gf | 24 +++---- 4 files changed, 52 insertions(+), 54 deletions(-) diff --git a/lib/src/abstract/Terminology.gf b/lib/src/abstract/Terminology.gf index b0a8d9f43..9f7948f71 100644 --- a/lib/src/abstract/Terminology.gf +++ b/lib/src/abstract/Terminology.gf @@ -82,6 +82,7 @@ fun comparative_Parameter : Parameter ; superlative_Parameter : Parameter ; predicative_Parameter : Parameter ; + attributive_Parameter : Parameter ; negative_Parameter : Parameter ; positivePol_Parameter : Parameter ; -- as opposed to negative, e.g. for verbs diff --git a/lib/src/dutch/DocumentationDutFunctor.gf b/lib/src/dutch/DocumentationDutFunctor.gf index 9199777bf..31e1d0e60 100644 --- a/lib/src/dutch/DocumentationDutFunctor.gf +++ b/lib/src/dutch/DocumentationDutFunctor.gf @@ -30,40 +30,39 @@ lin }) ; s2 = frameTable ( tr (th "" ++ th (heading singular_Parameter) ++ th (heading plural_Parameter) ) ++ - tr (th (heading nominative_Parameter) ++ td (noun.s ! Sg ! Nom) ++ td (noun.s ! NF Pl Nom)) ++ - tr (th (heading genitive_Parameter) ++ td (noun.s ! Sg ! Gen) ++ td (noun.s ! NF Pl Gen)) + tr (th (heading nominative_Parameter) ++ td (noun.s ! NF Sg Nom) ++ td (noun.s ! NF Pl Nom)) ++ + tr (th (heading genitive_Parameter) ++ td (noun.s ! NF Sg Gen) ++ td (noun.s ! NF Pl Gen)) ) } ; InflectionA, InflectionA2 = \adj -> let - gforms : Degree -> ResDut.Case -> Str = \d,c -> - td (adj.s ! d ! (AMod (GSg Utr) c)) ++ - td (adj.s ! d ! (AMod (GSg Neutr) c)) ++ - td (adj.s ! d ! (AMod GPl c)) ; - dtable : Parameter -> Degree -> Str = \s,d -> - paragraph (heading2 (heading s) ++ frameTable ( - tr (th [] ++ th (heading uter_Parameter) ++ th (heading neuter_Parameter) ++ - th (heading plural_Parameter)) ++ - tr (th (heading nominative_Parameter) ++ gforms d Nom) ++ - tr (th (heading genitive_Parameter) ++ gforms d Gen) ++ - tr (th (heading dative_Parameter) ++ gforms d Dat) ++ - tr (th (heading accusative_Parameter) ++ gforms d Acc) ++ - tr (th (heading predicative_Parameter) ++ intagAttr "td" "colspan=4" (adj.s ! d ! APred)) - )) + gforms : AForm -> Str = \a -> + td (adj.s ! Posit ! a) ++ + td (adj.s ! Compar ! a) ++ + td (adj.s ! Superl ! a) ; + + dtable : Str = + frameTable ( + tr (th [] ++ th (heading positive_Parameter) ++ th (heading comparative_Parameter) ++ + th (heading superlative_Parameter)) ++ + tr (th (heading predicative_Parameter) ++ gforms APred) ++ + tr (th (heading attributive_Parameter) ++ gforms APred) ++ + tr (th (heading partitive_Parameter) ++ gforms AGen) + ) in { t = "a" ; s1 = heading1 (nounHeading adjective_Category).s ; - s2 = dtable positive_Parameter Posit ++ dtable comparative_Parameter Compar ++ dtable superlative_Parameter Superl + s2 = dtable } ; InflectionAdv adv = { - t = "adverb" ; + t = "adv" ; s1 = heading1 (heading preposition_Category) ; s2 = paragraph adv.s } ; InflectionPrep p = { - t = "präp" ; + t = "prep" ; s1 = heading1 (heading preposition_Category) ; s2 = paragraph (S.mkAdv (lin Prep p) (S.mkNP S.a_Det L.computer_N)).s } ; @@ -148,34 +147,30 @@ oper ++ ";" ++ (S.mkUtt (S.mkS S.anteriorAnt cl)).s --# notpresent ; - inflVerb : Verb -> Str = \verb -> + inflVerb : VVerb -> Str = \verb -> let vfin : VForm -> Str = \f -> verb.s ! f ++ verb.prefix ; - gforms : Number -> Person -> Str = \n,p -> - td (vfin (VFin False (VPresInd n p))) ++ - td (vfin (VFin False (VPresSubj n p))) - ++ td (vfin (VFin False (VImpfInd n p))) --# notpresent - ++ td (vfin (VFin False (VImpfSubj n p))) --# notpresent - ; + gforms : VForm -> Str = \f -> + td (vfin f) ; + in 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) - ) ++ + tr (th "" ++ th (heading present_Parameter) ++ th (heading past_Parameter)) ++ + tr (th "Sg.1" ++ gforms VPresSg1 + ++ intagAttr "td" "rowspan=3" (vfin VPastSg) --# notpresent + ) ++ + tr (th "Sg.2" ++ gforms VPresSg2) ++ + tr (th "Sg.3" ++ gforms VPresSg3) ++ + tr (th "Pl" ++ gforms VPresPl + ++ td (vfin VPastPl) --# notpresent + )) ++ frameTable ( - tr (th (heading imperative_Parameter ++ "Sg.2") ++ td (vfin (VImper Sg))) ++ - tr (th (heading imperative_Parameter ++ "Pl.2") ++ td (vfin (VImper Pl))) ++ - tr (th (heading infinitive_Parameter) ++ td (verb.s ! (VInf False))) ++ - tr (th (heading present_Parameter ++ heading participle_Parameter) ++ td (verb.s ! (VPresPart APred))) ++ - tr (th (heading perfect_Parameter ++ heading participle_Parameter) ++ td (verb.s ! (VPastPart APred))) ++ - tr (th (heading aux_verb_Parameter) ++ td (case verb.aux of {VHaben => "haben" ; VSein => "sein"})) + tr (th (heading imperative_Parameter ++ "Sg.2") ++ td (vfin VImp2)) ++ + tr (th (heading imperative_Parameter ++ "Sg.3") ++ td (vfin VImp3)) ++ + tr (th (heading imperative_Parameter ++ "Pl.2") ++ td (vfin (VImpPl))) ++ + tr (th (heading infinitive_Parameter) ++ td (verb.s ! VInf)) ++ + tr (th (heading perfect_Parameter ++ heading participle_Parameter) ++ td (verb.s ! VPerf)) ++ + tr (th (heading aux_verb_Parameter) ++ td (case verb.aux of {VHebben => "hebben" ; VZijn => "zijn"})) ) ; } diff --git a/lib/src/dutch/LangDut.gf b/lib/src/dutch/LangDut.gf index 04213a0ad..f62e0242a 100644 --- a/lib/src/dutch/LangDut.gf +++ b/lib/src/dutch/LangDut.gf @@ -3,5 +3,5 @@ concrete LangDut of Lang = GrammarDut, LexiconDut ----- ,DocumentationDut + ,DocumentationDut ; diff --git a/lib/src/dutch/TerminologyDut.gf b/lib/src/dutch/TerminologyDut.gf index 6592686c0..6baa68cc8 100644 --- a/lib/src/dutch/TerminologyDut.gf +++ b/lib/src/dutch/TerminologyDut.gf @@ -38,17 +38,18 @@ lin genitive_Parameter = mkN "genitief" ; dative_Parameter = mkN "datief" ; accusative_Parameter = mkN "accusatief" ; - - imperative_Parameter = mkN "imperatief" ; - indicative_Parameter = mkN "indicatief" ; - conjunctive_Parameter = mkN "conjunctief" ; - infinitive_Parameter = mkN "infinitief" ; + partitive_Parameter = mkN "partitief" ; - present_Parameter = mkN "tegenwoordige tijd" ; - past_Parameter = mkN "verleden tijd" ; - future_Parameter = mkN "toekomende tijd" ; - conditional_Parameter = mkN "voorwaardelijke wijs" ; - perfect_Parameter = mkN "voltooide tijd" ; + imperative_Parameter = mkN "gebiedend" ; + indicative_Parameter = mkN "aantonend" ; + conjunctive_Parameter = mkN "aanvoegend" ; + infinitive_Parameter = mkN "onbepaald" ; + + present_Parameter = mkN "tegenwoordig" ; + past_Parameter = mkN "verleden" ; + future_Parameter = mkN "toekomend" ; + conditional_Parameter = mkN "voorwaardelijk" ; + perfect_Parameter = mkN "voltooid" ; participle_Parameter = mkN "deelwoord" ; aux_verb_Parameter = mkN "hulpwerkwoord" ; @@ -56,7 +57,8 @@ lin positive_Parameter = mkN "stellend" ; comparative_Parameter = mkN "vergrotend" ; superlative_Parameter = mkN "overtreffend" ; - predicative_Parameter = mkN "predicatief" ; + predicative_Parameter = mkN "onverbogen" ; + attributive_Parameter = mkN "verbogen" ; nounHeading n = ss (n.s ! NF Sg Nom) ;