diff --git a/src/german/AllGer.gf b/src/german/AllGer.gf index 83e6751f..471083a5 100644 --- a/src/german/AllGer.gf +++ b/src/german/AllGer.gf @@ -3,7 +3,6 @@ concrete AllGer of AllGerAbs = LangGer, IrregGer, ----- ExtendGer, ---- to replace ExtraGer - ExtraGer - ** open ExtendGer in {} ---- to force compilation + ExtendGer + ** open ExtraGer in {} ---- to force compilation ; diff --git a/src/german/AllGerAbs.gf b/src/german/AllGerAbs.gf index de083669..9293d25c 100644 --- a/src/german/AllGerAbs.gf +++ b/src/german/AllGerAbs.gf @@ -1,8 +1,7 @@ ---# -path=.:../abstract:../common:prelude +--# -path=.:../abstract:../common:../prelude abstract AllGerAbs = Lang, IrregGerAbs, ----- Extend, - ExtraGerAbs + Extend ** {} ; diff --git a/src/german/CatGer.gf b/src/german/CatGer.gf index db56a35c..5654bf63 100644 --- a/src/german/CatGer.gf +++ b/src/german/CatGer.gf @@ -67,7 +67,7 @@ concrete CatGer of Cat = Quant = { s,sp : GenNum => Case => Str ; a : Adjf ; - hasDefArt : Bool ; + isDefArt : Bool ; delCardOne : Bool -- delete following cardinal 1 (IndefArt and no_Quant) } ; Predet = { @@ -94,18 +94,19 @@ concrete CatGer of Cat = -- Open lexical classes, e.g. Lexicon - V, VA, VS, VQ = ResGer.Verb ; -- = {s : VForm => Str} ; + V, VA, VS, VQ = Verb ; -- = {s : VForm => Str} ; VV = Verb ** {isAux : Bool} ; V2, V2A, V2S, V2Q = Verb ** {c2 : Preposition} ; V2V = Verb ** {c2 : Preposition ; isAux : Bool ; objCtrl : Bool} ; V3 = Verb ** {c2, c3 : Preposition} ; - A = {s : Degree => AForm => Str} ; - A2 = {s : Degree => AForm => Str ; c2 : Preposition} ; + A = Adjective ; -- = {s : Degree => AForm => Str} ; + A2 = Adjective ** {c2 : Preposition} ; - N = ResGer.Noun ; - N2 = ResGer.Noun ** {c2 : Preposition} ; - N3 = ResGer.Noun ** {c2,c3 : Preposition} ; + N = Noun ; -- {s : Number => Case => Str ; co : Str ; + -- uncap : {s: Number => Case => Str ; co : Str} ; g : Gender} + N2 = Noun ** {c2 : Preposition} ; + N3 = Noun ** {c2,c3 : Preposition} ; GN = {s : Case => Str; g : Sex} ; SN = {s : Sex => Case => Str} ; PN = {s : Case => Str; g : Gender; n : Number} ; diff --git a/src/german/ConstructionGer.gf b/src/german/ConstructionGer.gf index 1ba841dc..be80e681 100644 --- a/src/german/ConstructionGer.gf +++ b/src/german/ConstructionGer.gf @@ -2,7 +2,7 @@ concrete ConstructionGer of Construction = CatGer ** open SyntaxGer, SymbolicGer, (P = ParadigmsGer), - (L = LexiconGer), (E = ExtraGer), (G = GrammarGer), (I = IrregGer), (R = ResGer), (N = NounGer), Prelude in { + (L = LexiconGer), (E = ExtendGer), (G = GrammarGer), (I = IrregGer), (R = ResGer), (N = NounGer), Prelude in { flags coding=utf8 ; oper diff --git a/src/german/ExtendGer.gf b/src/german/ExtendGer.gf index bd60500b..b11584e6 100644 --- a/src/german/ExtendGer.gf +++ b/src/german/ExtendGer.gf @@ -2,15 +2,19 @@ concrete ExtendGer of Extend = CatGer ** ExtendFunctor - - [ - InOrderToVP, - VPS, ListVPS, VPI, ListVPI, RNP, RNPList, - MkVPS, BaseVPS, ConsVPS, ConjVPS, PredVPS, - MkVPI, BaseVPI, ConsVPI, ConjVPI, ComplVPIVV, - ComplSlashPartLast, - Base_nr_RNP, Base_rn_RNP, Base_rr_RNP, Conj_RNP, - CardCNCard, CompoundN, - PassVPSlash, PassAgentVPSlash, PastPartAP, PastPartAgentAP + - [ -- remove the default implementations of: + GenNP, EmptyRelSlash, + VPS, ListVPS, MkVPS, BaseVPS, ConsVPS, ConjVPS, PredVPS, + VPI, ListVPI, MkVPI, BaseVPI, ConsVPI, ConjVPI, ComplVPIVV, + ICompAP, IAdvAdv, CompIQuant, PrepCN, + PastPartAP, PastPartAgentAP, + PassVPSlash, PassAgentVPSlash, + AdvIsNP, + RNP, RNPList, Base_rr_RNP, Base_nr_RNP, Base_rn_RNP, Cons_rr_RNP, Cons_nr_RNP, Conj_RNP, + ReflRNP, ReflPron, ReflPoss, PredetRNP, AdvRNP, ReflA2RNP, PossPronRNP, + CompoundN, DetNPMasc, DetNPFem, UseDAP, UseDAPMasc, UseDAPFem, + CardCNCard, + InOrderToVP ] with (Grammar = GrammarGer) ** @@ -19,7 +23,22 @@ concrete ExtendGer of Extend = ResGer, Coordination, Prelude, - ParadigmsGer in { + (P = ParadigmsGer) in { + + lin + GenNP np = { + s,sp = \\gn,c => np.s ! False ! Gen ++ np.ext ++ np.rc ; + a = Strong ; + isDefArt = False ; + delCardOne = False + } ; + + EmptyRelSlash slash = { + s = \\m,t,a,p,gn => + appPrep slash.c2 (relPron ! gn) ++ slash.s ! m ! t ! a ! p ! Sub ; + c = slash.c2.c + } ; + lincat VPI = {s : Bool => Str} ; @@ -27,37 +46,13 @@ concrete ExtendGer of Extend = VPS = {s : Order => Agr => Str} ; [VPS] = {s1,s2 : Order => Agr => Str} ; -lin - - InOrderToVP vp = {s = "um" ++ useInfVP False vp} ; - + lin BaseVPI = twoTable Bool ; ConsVPI = consrTable Bool comma ; - MkVPI vp = {s = \\b => useInfVP b vp} ; - ConjVPI = conjunctDistrTable Bool ; - - ComplVPIVV v vpi = - insertInf {inpl = <\\_ => [], (vpi.s ! v.isAux)> ; extr = \\_ => []} -- HL 3/22 - (predVGen v.isAux v) ; - BaseVPS = twoTable2 Order Agr ; ConsVPS = consrTable2 Order Agr comma ; - PredVPS np vpi = - let - subj = np.s ! False ! Nom ++ bigNP np ; - agr = np.a ; - in { - s = \\o => - let verb = vpi.s ! o ! agr - in case o of { - Main => subj ++ verb ; - Inv => verb ++ subj ; ---- älskar henne och sover jag - Sub => subj ++ verb - } - } ; - MkVPS tm p vp = let vps = useVP vp in { s = \\o,agr => @@ -115,7 +110,251 @@ lin } ; ConjVPS = conjunctDistrTable2 Order Agr ; + + PredVPS np vpi = + let + subj = np.s ! False ! Nom ++ bigNP np ; + agr = np.a ; + in { + s = \\o => + let verb = vpi.s ! o ! agr + in case o of { + Main => subj ++ verb ; + Inv => verb ++ subj ; ---- älskar henne och sover jag + Sub => subj ++ verb + } + } ; + +-- existentials that work in the absence of Cl + MkVPI vp = {s = \\b => useInfVP b vp} ; + + ConjVPI = conjunctDistrTable Bool ; + + ComplVPIVV v vpi = + insertInf {inpl = <\\_ => [], (vpi.s ! v.isAux)> ; extr = \\_ => []} -- HL 3/22 + (predVGen v.isAux v) ; + +-- the same for VPSlash, taking a complement with shared V2 verbs + +-- Conjunction of copula complements + +-- Conjunction of imperatives + + ICompAP ap = { + s = \\_ => "wie" ++ ap.s ! APred ; + ext = ap.c.p1 ++ ap.c.p2 ++ ap.ext + } ; + + IAdvAdv adv = {s = "wie" ++ adv.s} ; + + CompIQuant iq = { + s = \\a => iq.s ! (gennum (genderAgr a) (numberAgr a))! Nom ; + ext = "" + } ; + + PrepCN prep cn = { + s = prep.s ! GPl ++ cn.s ! Strong ! Sg ! prep.c ++ cn.adv ++ cn.rc ! Sg ++ cn.ext} ; + + -- fronted/focal constructions, only for main clauses + + -- participle constructions + + PastPartAP vp = + let a = agrP3 Sg in { + s = \\af => (vp.nn ! a).p1 ++ (vp.nn ! a).p2 ++ (vp.nn ! a).p3 ++ vp.a2 ++ vp.adj + ++ vp.inf.inpl.p2 ++ (vp.inf.extr ! a) ++ vp.s.s ! VPastPart af ; + isPre = True ; + c = <[],[]> ; + ext = vp.ext + } ; + + PastPartAgentAP vp np = + let a = agrP3 Sg ; + agent = appPrepNP P.von_Prep np + in { + s = \\af => (vp.nn ! a).p1 ++ (vp.nn ! a).p2 ++ (vp.nn ! a).p3 + ++ vp.a2 ++ agent ++ vp.adj ++ vp.inf.inpl.p2 + ++ vp.c2.s ! GPl -- junk if not TV + ++ vp.ext ++ (vp.inf.extr ! a) ++ vp.s.s ! VPastPart af ; + isPre = True ; + c = <[],[]> ; + ext = [] + } ; + +-- this is a generalization of Verb.PassV2 and should replace it in the future. + + PassVPSlash vp = + insertObj (\\_ => (PastPartAP vp).s ! APred) (predV werdenPass) ** + { c1 = subjPrep vp.c2 } ; + -- this also gives "mit dir wird gerechnet" ; + -- the alternative linearisation ("es wird mit dir gerechnet") is not implemented + + PassAgentVPSlash vp np = ---- "von" here, "durch" in StructuralGer + insertObj (\\_ => (PastPartAgentAP (lin VPSlash vp) (lin NP np)).s ! APred) (predV werdenPass) ; + +-- publishing of the document + +-- counterpart to ProgrVP, for VPSlash + +-- construct VPSlash from A2 and N2 + +-- existential for mathematics + +-- existentials with a/no variation + +-- generalisation of existential, with adverb as an argument + + AdvIsNP adv np = let comp : Agr => Str = \\agr => np.s ! False ! Nom ++ np.rc ++ np.ext in + mkClause adv.s np.a (insertObj comp (predV sein_V)) ; -- HL 12/2023, prelim, wrong order + +-- infinitive for purpose AR 21/8/2013 + +-- object S without "that" + +-- front the extraposed part + +-- proper structure of "it is AP to VP" + +-- to use an AP as CN or NP without CN + +-- infinitive complement for IAdv + +-- alternative to EmbedQS. For English, EmbedQS happens to work, + +-- Reflexive noun phrases -- (HL 5/2022: improved and completed, RNPList added) + + lincat + RNP = {s : Agr => Case => Str ; rc,ext : Str ; isPron : Bool} ; + RNPList = {s1,s2 : Agr => Case => Str} ; + + linref + RNP = \rnp -> rnp.s ! AgSgP3 Masc ! Acc ++ rnp.ext ++ rnp.rc ; + + lin + ReflRNP vps rnp = + insertObjReflNP (lin RNP rnp) vps ; + + ReflPron = { -- with personal pronoun nominative + s = ResGer.reflPron ; rc,ext = [] ; isPron = True } ; + + -- To distinguish personal pronoun from reflexive pronoun: + -- du kennst mich vs. ich kenne mich selbst + -- er kennt ihn vs. er kennt sich (selbst) + -- sie kennen sich (selbst) =/= sie kennen einander + -- we might define ReflPron by the stronger + -- oper + -- reflPronSelf : Agr => Case => Str = + -- \\a => \\c => reflPron ! a ! c ++ "selbst" ; + + lin + ReflPoss num cn = + {s = \\a,c => let adjf = case num.n of {Sg => Strong ; Pl => Weak} -- Duden 477, HL 5/2022 + in possPron a num.n cn.g c + ++ num.s ! AMod (gennum cn.g num.n) c -- HL 5/2022: meine wenigstens 3 cn, + ++ cn.s ! adjfCase adjf c ! num.n ! c -- not: wenigstens 3 meine cn + ++ cn.adv ; + ext = cn.ext ; rc = cn.rc ! num.n ; + isPron = False} ; + + -- To distinguish possessive pronoun from reflexive possessive pronoun: + -- du kennst meine Fehler vs. ich kenne meine eigenen Fehler + -- er|sie|es kennt seine|ihre Fehler vs. er|sie|es kennt seine|ihre|seine eigenen Fehler + -- we might define ReflPoss by the stronger + -- oper + -- reflPossPron : Agr -> Number -> Gender -> Case -> Str = + -- let eigen = adjForms "eigen" "eigen" in + -- \a,n,g,c -> possPron a n g c ++ (eigen ! (AMod (gennum g n) c)) ; + + PredetRNP pred rnp = rnp ** { -- HL 5/2022 + s = \\a,c => let n : Number = case pred.a of {PAg n => n ; _ => numberAgr a} ; + g : Gender = genderAgr a ; + d = case pred.c.k of {NoCase => c ; PredCase k => k} ; + in case rnp.isPron of { + True => pred.s ! Pl ! Masc ! c ++ "von" ++ rnp.s ! a ! Dat ; + _ => pred.s ! n ! genderAgr a ! c ++ pred.c.p ++ rnp.s ! a ! d} ; + ext = rnp.ext ; rc = rnp.rc ; + isPron = False} ; + -- ok: alle von uns; die meisten von uns ; wrong: *nur von uns =/= nur wir + + AdvRNP np prep rnp = {s = \\a,c => np.s ! False ! c + ++ appPrep prep (rnp.s ! a) ++ rnp.ext ++ rnp.rc ; + ext = np.ext ; rc = np.rc ; isPron = False} ; + + AdvRAP ap prep rnp = + let -- ? adv ++ ap.s ! af + adv = appPrep prep (rnp.s ! agrP3 Sg) ; -- bug: fixed agreement + in ap ** { s = \\af => ap.s ! af ++ adv } ; -- e.g. unknown in one's youth + + ReflA2RNP adj rnp = -- would need AP.c : Agr => Str*Str, not AP.c : Str*Str + let -- as we have no reflexive AP, + compl = appPrep adj.c2 (rnp.s ! agrP3 Sg) ; -- we use a fixed agreement + in { + s = adj.s ! Posit ; + isPre = True ; + c = case adj.c2.t of {isCase => ; _ => <[], compl>} ; + ext = rnp.ext ++ rnp.rc + } ; + + PossPronRNP pron num cn rnp = + GrammarGer.DetCN (GrammarGer.DetQuant (GrammarGer.PossPron pron) num) + (GrammarGer.PossNP cn (lin NP {s = \\_,c => rnp.s ! pron.a ! c ; + a = pron.a ; + w = WLight ; + ext = rnp.ext ; + rc = rnp.rc})) ; + + -- AdvRVP : VP -> Prep -> RNP -> VP not implemented, as the reflexive adverb (Prep + RNP): Agr => Str + -- could only be added to vp.a2:Str with fixed agreement, but can depend on nominal subject or object, + -- e.g. "er spricht mit ihr über sein Kind" vs. "er spricht mit ihr über ihr Kind". + + ConjRNP conj rnps = conjunctDistrTable2 Agr Case conj rnps + ** {isPron = False ; ext,rc = []} ; + + Base_rr_RNP x y = twoTable2 Agr Case x y ; + Base_nr_RNP x y = twoTable2 Agr Case {s = \\_,c => x.s ! False ! c ++ x.ext ++ x.rc} y ; + Base_rn_RNP x y = twoTable2 Agr Case x {s = \\_,c => y.s ! False ! c ++ y.ext ++ y.rc} ; + + Cons_rr_RNP x xs = consrTable2 Agr Case comma x xs ; + Cons_nr_RNP x xs = consrTable2 Agr Case comma {s = \\_,c => x.s ! False ! c ++ x.ext ++ x.rc} xs ; + +-- reflexive possessive on its own right, like in Swedish, Czech, Slovak + +--- from Extensions + + CompoundN a x = + let s = a.co in lin N { + s = \\n,c => s ++ Predef.BIND ++ x.uncap.s ! n ! c ; + co = s ++ Predef.BIND ++ x.uncap.co ; + uncap = { + s = \\n,c => a.uncap.co ++ Predef.BIND ++ x.uncap.s ! n ! c ; + co = a.uncap.co ++ Predef.BIND ++ x.uncap.co ; + } ; + g = x.g + } ; + +-- very language-specific things + +-- Romance + + DetNPMasc det = { + s = \\b,c => det.sp ! b ! Masc ! c ; + a = agrgP3 Masc det.n ; + w = case det.isDef of {True => WLight ; _ => WHeavy} ; + ext, rc = [] + } ; + + DetNPFem det = { + s = \\b,c => det.sp ! b ! Fem ! c ; + a = agrgP3 Fem det.n ; + w = case det.isDef of {True => WLight ; _ => WHeavy} ;--WLight ; + ext, rc = [] + } ; + +-- German + +-- UseDAP replaces DetNP from the RGL which is more limited. + UseDAP det = { s = \\b,c => det.sp ! Neutr ! c ; a = agrP3 det.n ; @@ -137,168 +376,32 @@ lin rc, ext = [] } ; -lin - CardCNCard card cn = { - s = \\g,c => - (Grammar.DetCN (Grammar.DetQuant Grammar.IndefArt (Grammar.NumCard card)) cn).s ! False ! c ; - n = Pl - } ; - -lin PassVPSlash vp = - insertObj (\\_ => (PastPartAP vp).s ! APred) (predV werdenPass) ** - { c1 = subjPrep vp.c2 } ; - -- this also gives "mit dir wird gerechnet" ; - -- the alternative linearisation ("es wird mit dir gerechnet") is not implemented - -lin PassAgentVPSlash vp np = ---- "von" here, "durch" in StructuralGer - insertObj (\\_ => (PastPartAgentAP (lin VPSlash vp) (lin NP np)).s ! APred) (predV werdenPass) ; - -lin PastPartAP vp = - let a = agrP3 Sg in { - s = \\af => (vp.nn ! a).p1 ++ (vp.nn ! a).p2 ++ (vp.nn ! a).p3 ++ vp.a2 ++ vp.adj - ++ vp.inf.inpl.p2 ++ (vp.inf.extr ! a) ++ vp.s.s ! VPastPart af ; - isPre = True ; - c = <[],[]> ; - ext = vp.ext + CardCNCard card cn = { + s = let det = (Grammar.DetQuant Grammar.IndefArt (Grammar.NumCard card)) ; + np = (Grammar.DetCN det cn).s ! False + in table{APred => np ! Nom ; AMod gn c => np ! c} ; -- HL 12/2023 + n = Pl } ; -lin PastPartAgentAP vp np = - let a = agrP3 Sg ; - agent = appPrepNP von_Prep np - in { - s = \\af => (vp.nn ! a).p1 ++ (vp.nn ! a).p2 ++ (vp.nn ! a).p3 - ++ vp.a2 ++ agent ++ vp.adj ++ vp.inf.inpl.p2 - ++ vp.c2.s ! GPl -- junk if not TV - ++ vp.ext ++ (vp.inf.extr ! a) ++ vp.s.s ! VPastPart af ; - isPre = True ; - c = <[],[]> ; - ext = [] - } ; -lin CompoundN a x = - let s = a.co in - lin N { - s = \\n,c => s ++ Predef.BIND ++ x.uncap.s ! n ! c ; - co = s ++ Predef.BIND ++ x.uncap.co ; - uncap = { - s = \\n,c => a.uncap.co ++ Predef.BIND ++ x.uncap.s ! n ! c ; - co = a.uncap.co ++ Predef.BIND ++ x.uncap.co ; - } ; - g = x.g - } ; + InOrderToVP vp = {s = "um" ++ useInfVP False vp} ; - --- Reflexive noun phrases -- (HL 5/2022: improved and completed, RNPList added) - - lincat - RNP = {s : Agr => Case => Str ; rc,ext : Str ; isPron : Bool} ; -- Case, not PCase !!! - RNPList = {s1,s2 : Agr => Case => Str} ; - - linref - RNP = \rnp -> rnp.s ! AgSgP3 Masc ! Acc ++ rnp.ext ++ rnp.rc ; - - lin - ReflRNP vps rnp = - insertObjReflNP rnp vps ; - - ReflPron = { -- with personal pronoun nominative - s = ResGer.reflPron ; rc,ext = [] ; isPron = True } ; - - -- We might define ReflPron by the stronger reflPronSelf below, using "selbst" - -- to distinguish personal pronoun from reflexive pronoun: - -- du kennst mich vs. ich kenne mich selbst - -- er kennt ihn vs. er kennt sich (selbst) - -- sie kennen sich (selbst) =/= sie kennen einander - - ReflPoss num cn = - {s = \\a,c => let adjf = case num.n of {Sg => Strong ; Pl => Weak} -- Duden 477, HL 5/2022 - in possPron a num.n cn.g c ++ num.s ! cn.g ! c -- HL 5/2022: meine wenigstens 3 cn, - ++ cn.s ! adjfCase adjf c ! num.n ! c -- not: wenigstens 3 meine cn - ++ cn.adv ; - ext = cn.ext ; rc = cn.rc ! num.n ; - isPron = False} ; - - -- We might define ReflPoss by the stronger reflPossPron below, using "eigen(er)" - -- to distinguish possessive pronoun from reflexive possessive pronoun: - -- du kennst meine Fehler vs. ich kenne meine eigenen Fehler - -- er|sie|es kennt seine|ihre Fehler vs. er|sie|es kennt seine|ihre|seine eigenen Fehler - - PredetRNP pred rnp = rnp ** { -- HL 5/2022 - s = \\a,c => let n : Number = case pred.a of {PAg n => n ; _ => numberAgr a} ; - g : Gender = genderAgr a ; - d = case pred.c.k of {NoCase => c ; PredCase k => (prepC k).c} ; - in case rnp.isPron of { - True => pred.s ! Pl ! Masc ! c ++ "von" ++ rnp.s ! a ! Dat ; - _ => pred.s ! n ! genderAgr a ! c ++ pred.c.p ++ rnp.s ! a ! d} ; - ext = rnp.ext ; rc = rnp.rc ; - isPron = False} ; - -- ok: alle von uns; die meisten von uns ; wrong: *nur von uns =/= nur wir -{- - AdvRNP np prep rnp = {s = \\a,c => np.s ! c - ++ appPrep prep (rnp.s ! a) ++ rnp.ext ++ rnp.rc ; - ext = np.ext ; rc = np.rc ; isPron = False} ; - - AdvRAP ap prep rnp = - let -- ? adv ++ ap.s ! af - adv = appPrep prep (rnp.s ! agrP3 Sg) ; -- bug: fixed agreement - in ap ** { s = \\af => ap.s ! af ++ adv } ; -- e.g. unknown in one's youth - - ReflA2RNP adj rnp = -- would need AP.c : Agr => Str*Str, not AP.c : Str*Str - let -- as we have no reflexive AP, - compl = appPrep adj.c2 (rnp.s ! agrP3 Sg) ; -- we use a fixed agreement - in { - s = adj.s ! Posit ; - isPre = True ; - c = case adj.c2.t of {False => ; True => <[], compl>} ; - ext = rnp.ext ++ rnp.rc - } ; - - PossPronRNP pron num cn rnp = - GrammarGer.DetCN (GrammarGer.DetQuant (GrammarGer.PossPron pron) num) - (GrammarGer.PossNP cn (lin NP {s = \\pc => -- usePrepC pc (\c -> rnp.s ! pron.a ! c) ; - rnp.s ! pron.a ! pc ; - a = pron.a ; - w = WLight ; - ext = rnp.ext ; - rc = rnp.rc})) ; - - -- AdvRVP : VP -> Prep -> RNP -> VP not implemented, as the reflexive adverb (Prep + RNP): Agr => Str - -- could only be added to vp.a2:Str with fixed agreement, but can depend on nominal subject or object, - -- e.g. "er spricht mit ihr über sein Kind" vs. "er spricht mit ihr über ihr Kind". --} - ConjRNP conj rnps = conjunctDistrTable2 Agr Case conj rnps - ** {isPron = False ; ext,rc = []} ; - - Base_rr_RNP x y = twoTable2 Agr Case x y ; - Base_nr_RNP x y = twoTable2 Agr Case {s = \\_,c => x.s ! False ! c ++ x.ext ++ x.rc} y ; - Base_rn_RNP x y = twoTable2 Agr Case x {s = \\_,c => y.s ! False ! c ++ y.ext ++ y.rc} ; - - Cons_rr_RNP x xs = consrTable2 Agr Case comma x xs ; - Cons_nr_RNP x xs = consrTable2 Agr Case comma {s = \\_,c => x.s ! False ! c ++ x.ext ++ x.rc} xs ; -{- oper --- reflPronSelf : Agr => Case => Str = \\a => \\c => reflPron ! a ! c ++ "selbst" ; - - -- reflPossPron : Agr -> Number -> Gender -> Case -> Str = - -- let eigen = adjForms "eigen" "eigen" in - -- \a,n,g,c -> possPron a n g c ++ (eigen ! (AMod (gennum g n) c)) ; - insertObjReflNP : RNP -> ResGer.VPSlash -> ResGer.VP = -- HL 5/2022 \rnp,vp -> insertObjRNP rnp vp.c2 vp ; insertObjRNP : RNP -> Preposition -> ResGer.VPSlash -> ResGer.VP = -- HL 5/2022 \rnp,prep,vp -> -- generalize ResGer.insertObjRefl - let -- prep = vp.c2 ; - c = case prep.c of { NPC cc => cc ; _ => Acc } ; -- put rnp.ext ++ rnp.rc to vp.ext ? - obj : Agr => Str = \\a => prep.s ++ rnp.s ! a ! c ++ rnp.ext ++ rnp.rc + let + obj : Agr => Str = \\a => prep.s ! GPl ++ rnp.s ! a ! prep.c ++ rnp.ext ++ rnp.rc in vp ** { nn = \\a => let vpnn = vp.nn ! a in - case of { -- consider non-pron rnp as light, add to vpnn.p2 - => ; -- pronoun switch: - => ; -- accPron < pron - => ; -- < non-pron nominal - => } -- or prepositional + case of { -- consider non-pron rnp as light, add to vpnn.p2 + => ; -- pronoun switch: + => ; -- accPron < pron + => ; -- < non-pron nominal + <_,_,_> => } -- or prepositional } ; --} + } diff --git a/src/german/ExtraGer.gf b/src/german/ExtraGer.gf index d63c5890..d0eff2f2 100644 --- a/src/german/ExtraGer.gf +++ b/src/german/ExtraGer.gf @@ -269,32 +269,18 @@ concrete ExtraGer of ExtraGerAbs = CatGer ** insertObjRNP : RNP -> Preposition -> ResGer.VPSlash -> ResGer.VP = -- HL 5/2022 \rnp,prep,vp -> -- generalize ResGer.insertObjRefl - let -- prep = vp.c2 ; - c : Case = case prep.c of { cc => cc ; _ => Acc } ; -- put rnp.ext ++ rnp.rc to vp.ext ? - obj : Agr => Str = \\a => prep.s ! GPl ++ rnp.s ! a ! c ++ rnp.ext ++ rnp.rc + let + obj : Agr => Str = \\a => prep.s ! GPl ++ rnp.s ! a ! prep.c ++ rnp.ext ++ rnp.rc in vp ** { nn = \\a => let vpnn = vp.nn ! a in - case of { -- consider non-pron rnp as light, add to vpnn.p2 + case of { -- consider non-pron rnp as light, add to vpnn.p2 => ; -- pronoun switch: => ; -- accPron < pron => ; -- < non-pron nominal <_,_,_> => } -- or prepositional } ; -{- insertObjRNP : RNP -> Preposition -> ResGer.VPSlash -> ResGer.VPSlash = -- HL 8/2023 - \rnp,prep,vp -> -- generalize ResGer.insertObjNP - let c = case prep.c of { NPC cc => cc ; _ => Acc } ; - obj : Agr => Str = \\a => prep.s ++ rnp.s ! a ! c ++ rnp.ext ++ rnp.rc - in vp ** { - nn = \\a => - let vpnn = vp.nn ! a in - case of { -- consider non-pron rnp as light, add to vpnn.p2 - => ; -- pronoun switch: - => ; -- accPron < pron - => ; -- < non-pron nominal - => } -- or prepositional - } ; --} + -- SS: implementation of some of the relevant Foc rules from Extra lincat diff --git a/src/german/ExtraGerAbs.gf b/src/german/ExtraGerAbs.gf index e63d0115..f52e93cb 100644 --- a/src/german/ExtraGerAbs.gf +++ b/src/german/ExtraGerAbs.gf @@ -3,6 +3,7 @@ abstract ExtraGerAbs = Extra [ VPS,ListVPS,BaseVPS,ConsVPS,ConjVPS,MkVPS,PredVPS,EmptyRelSlash, VPSlash, PassVPSlash, PassAgentVPSlash, CompIQuant, PastPartAP, PastPartAgentAP, Temp,Tense,Pol,S,NP,VV,VP,Conj,IAdv,IQuant,IComp,ICompAP,IAdvAdv,Adv,AP, + Cl, Num, CN, Utt, Predet, Foc,FocObj,FocAdv,FocAP,UseFoc, RNP,ReflRNP,ReflPron,ReflPoss,PredetRNP ,RNPList,ConjRNP,Base_rr_RNP,Base_nr_RNP,Base_rn_RNP,Cons_rr_RNP,Cons_nr_RNP diff --git a/src/german/NounGer.gf b/src/german/NounGer.gf index 19d23437..c205f9e3 100644 --- a/src/german/NounGer.gf +++ b/src/german/NounGer.gf @@ -20,7 +20,7 @@ concrete NounGer of Noun = CatGer ** open ResGer, MorphoGer, Prelude in { ext = cn.ext } ; - DetNP det = { -- more genders in ExtraGer -- HL: der+er,den+en ; der drei,den drei+en + DetNP det = { -- more genders in ExtendGer s = \\b,c => det.sp ! b ! Neutr ! c ; a = agrP3 det.n ; -- isPron = False ; -- HL 6/2019: don't apply pronoun switch: ich gebe ihr das vs. ich gebe es ihr @@ -70,65 +70,69 @@ concrete NounGer of Noun = CatGer ** open ResGer, MorphoGer, Prelude in { w = WHeavy } ; + oper + dropDefArtSg : Number -> Bool -> (GenNum => Case => Str) -> (Bool => GenNum => Case => Str) = + \n,isDefArt,qnt -> case of { + => table{True => \\gn,c => [] ; False => qnt} ; + _ => \\b => qnt + } ; + einziger : AForm => Str = table{AMod gn c => "einzig" + adjEnding ! gn ! c ; _ => "einziges"} ; + + lin DetQuantOrd quant num ord = let n = num.n ; a = quant.a ; - isDefArtSg = case n of {Sg => quant.hasDefArt ; _ => False} ; + d = quant.isDefArt ; isCardOne = case n of {Sg => num.isNum ; _ => False} ; - quants : Bool => GenNum => Case => Str = - \\b => case andB b isDefArtSg of {True => \\gn,c => [] ; _ => quant.s} ; + qunt : Bool => GenNum => Case => Str = dropDefArtSg n d quant.s ; nums : AForm => Str = \\af => case af of { AMod (GSg g) c => case of { - => einziger ! af ; -- (k)ein einziger, drop cardinal "ein" of num + => einziger ! af ; -- (ein,kein) einziger <_,True> => num.sp ! af ; -- (der,dieser) eine ; (mein) einer - _ => num.s ! af } ; + _ => num.s ! af } ; -- (die,diese) zwei ---- todo inflection _ => num.s ! APred} in { - s = \\b,g,c => let gn = gennum g n in - quants ! b ! gn ! c ++ nums ! agrAdj a gn c ++ ord.s ! agrAdj a gn c ; - sp = \\b,g,c => let gn = gennum g n in - quants ! b ! gn ! c ++ nums ! agrAdj a gn c ++ ord.s ! agrAdj a gn c ; + s,sp = \\b,g,c => let gn = gennum g n in + qunt ! b ! gn ! c ++ nums ! agrAdj a gn c ++ ord.s ! agrAdj a gn c ; n = n ; a = a ; isDef = case a of {Strong => False ; _ => True} ; - hasDefArt = quant.hasDefArt + hasDefArt = d } ; DetQuant quant num = let n = num.n ; a = quant.a ; - isDefArtSg = case n of {Sg => quant.hasDefArt ; _ => False} ; + d = quant.isDefArt ; isCardOne = case n of {Sg => num.isNum ; _ => False} ; - quants : Bool => GenNum => Case => Str = - \\b => case andB b isDefArtSg of {True => \\gn,c => [] ; _ => quant.s} ; - quantsp' : GenNum => Case => Str = - \\gn,c => case num.isNum of {True => quant.s ! gn ! c ; - False => quant.sp ! gn ! c} ; + quants = dropDefArtSg n d quant.s ; quantsp : Bool => GenNum => Case => Str = - \\b => case andB b isDefArtSg of {True => \\gn,c => [] ; False => quantsp'} ; + dropDefArtSg n d (case num.isNum of {True => quant.s ; False => quant.sp}) ; nums : AForm => Str = \\af => case af of { AMod (GSg g) c => case of { => einziger ! af ; -- (k)ein einziger, drop cardinal "ein" of num <_,True> => num.sp ! af ; -- (der,dieser) eine ; (mein) einer _ => num.s ! af } ; - AMod GPl c => num.s ! APred ; + AMod GPl c => num.s ! APred ; -- (den,diesen) zwei(en) ---- todo: inflection APred => num.s ! APred} in { - s = \\b,g,c => quants ! b ! (gennum g n) ! c ++ nums ! agrAdj a (gennum g n) c ; - sp = \\b,g,c => quantsp ! b ! (gennum g n) ! c ++ nums ! agrAdj a (gennum g n) c ; + s = \\b,g,c => let gn = gennum g n in + quants ! b ! gn ! c ++ nums ! agrAdj a gn c ; + sp = \\b,g,c => let gn = gennum g n in + quantsp ! b ! gn ! c ++ nums ! agrAdj a gn c ; n = n ; a = a ; isDef = case a of {Strong => False ; _ => True} ; - hasDefArt = quant.hasDefArt + hasDefArt = d } ; PossPron p = { s = \\gn,c => p.s ! NPPoss gn c ; -- mein (dritter) sp = \\gn,c => p.sp ! PossF gn c ; -- meiner a = Mixed ; - hasDefArt = False ; + isDefArt = False ; delCardOne = False ; } ; @@ -163,12 +167,15 @@ concrete NounGer of Noun = CatGer ** open ResGer, MorphoGer, Prelude in { } ; DefArt = { s = \\gn,c => artDef ! gn ! c ; - sp = \\gn,c => case of { - => "denen" ; -- HL 6/2019 - => "derer" ; -- HL 6/2019 + sp = \\gn,c => case of { + => "dessen" ; + => "derer" ; + => "dessen" ; + => "denen" ; -- HL 6/2019 + => "derer" ; -- HL 6/2019 _ => artDef ! gn ! c } ; a = Weak ; - hasDefArt = True ; + isDefArt = True ; delCardOne = False ; } ; @@ -178,7 +185,7 @@ concrete NounGer of Noun = CatGer ** open ResGer, MorphoGer, Prelude in { sp = table {GSg g => \\c => "ein" + detEnding ! (GSg g) ! c ; GPl => caselist "einige" "einige" "einigen" "einiger"} ; a = MixedStrong ; -- Sg Mixed, Pl Strong - hasDefArt = False ; + isDefArt = False ; delCardOne = True ; } ; @@ -261,7 +268,7 @@ concrete NounGer of Noun = CatGer ** open ResGer, MorphoGer, Prelude in { -- det or numeral? np or rather (DefArt +) cn? drei (einiger Kinder) ? let g : Gender = genderAgr np.a in { - s = \\b,c => det.s ! b ! g ! c ++ appPrepNP vonDat np ++ bigNP np ; + s = \\b,c => det.s ! b ! g ! c ++ appPrepNP vonDat np ; a = agrgP3 g det.n ; w = case det.isDef of { True => WLight ; _ => WHeavy } ; rc = np.rc ; @@ -294,7 +301,4 @@ concrete NounGer of Noun = CatGer ** open ResGer, MorphoGer, Prelude in { ext = "" ; } ; - oper - einziger : AForm => Str = table{AMod gn c => "einzig" + adjEnding ! gn ! c ; _ => "einziges"} ; - } diff --git a/src/german/NumeralGer.gf b/src/german/NumeralGer.gf index ba67b587..d2b7963d 100644 --- a/src/german/NumeralGer.gf +++ b/src/german/NumeralGer.gf @@ -88,7 +88,8 @@ oper NOrd af => d.s ! invNum ++ BIND ++ i'.s ! NOrd af} ; n = Pl ; isDig = False ; - tail1to19 = case i.isDig of {True => notB isPld ; False => i.tail1to19} + tail1to19 = case i.isDig of {True => notB isPld ; False => i.tail1to19} ; + lock_Digits = <> } ; D_0 = mkDig "0" ** {isZero = True} ; diff --git a/src/german/StructuralGer.gf b/src/german/StructuralGer.gf index 02ae9312..ff28926c 100644 --- a/src/german/StructuralGer.gf +++ b/src/german/StructuralGer.gf @@ -40,7 +40,7 @@ concrete StructuralGer of Structural = CatGer ** everywhere_Adv = ss "überall" ; few_Det = { s,sp = \\_,g,c => "wenig" + adjEnding ! (gennum g Pl) ! c ; - n = Pl ; a = Weak ; isDef = False ; hasDefArt = False} ; + n = Pl ; a = Strong ; isDef = False ; hasDefArt = False} ; ---- first_Ord = {s = (regA "erst").s ! Posit} ; for_Prep = mkPrep "für" P.accusative ; from_Prep = mkPrep "aus" P.dative ; @@ -59,7 +59,7 @@ concrete StructuralGer of Structural = CatGer ** less_CAdv = X.mkCAdv "weniger" "als" ; many_Det = { s,sp = \\_,g,c => "viel" + adjEnding ! (gennum g Pl) ! c ; - n = Pl ; a = Weak ; isDef = False ; hasDefArt = False} ; + n = Pl ; a = Strong ; isDef = False ; hasDefArt = False} ; more_CAdv = X.mkCAdv "mehr" "als" ; -- most_Predet = {s = appAdj (regA "meist") ; c = noCase ; a = PAgNone} ; most_Predet = { -- HL 5/2022 @@ -70,8 +70,9 @@ concrete StructuralGer of Structural = CatGer ** c = {p = [] ; k = PredCase Gen} ; a = PAg Pl} ; much_Det = { - s = \\_,_,_ => "viel" ; sp = \\_,_,_ => "vieles" ; - n = Sg ; a = Weak ; isDef = False ; hasDefArt = False} ; + s = \\_,g,c => "viel" ; + sp = \\_,g,c => "viel" + detEnding ! (gennum g Sg) ! c ; ---- (GSg _ Sg) ! Gen ? + n = Sg ; a = Strong ; isDef = False ; hasDefArt = False} ; must_VV = auxVV (mkV "müssen" "muss" "musst" "muss" "müsst" "müss" @@ -94,16 +95,16 @@ concrete StructuralGer of Structural = CatGer ** somebody_NP = nameNounPhrase Masc {s = caselist "jemand" "jemanden" "jemandem" "jemands"} ; somePl_Det = { s,sp = \\_,g,c => "einig" + adjEnding ! (gennum g Pl) ! c ; - n = Pl ; a = Weak ; isDef = True ; hasDefArt = False} ; + n = Pl ; a = Strong ; isDef = True ; hasDefArt = False} ; someSg_Det = { - s = \\_,g,c => "ein" + pronEnding ! GSg g ! c ; -- ein, eine, ein - sp = \\_,g,c => "ein" + detEnding ! GSg g ! c ; -- einer, eine, eines - n = Sg ; a = Strong ; hasNum = True ; isDef = False ; hasDefArt = False - } ; + s = \\_,g,c => "ein" + pronEnding ! GSg g ! c ; -- ein, eine, ein + sp = \\_,g,c => "ein" + detEnding ! GSg g ! c ; -- einer, eine, eines + n = Sg ; a = Mixed ; isDef = False ; hasDefArt = False + } ; something_NP = nameNounPhrase Neutr {s = \\_ => "etwas"} ; somewhere_Adv = ss "irgendwo" ; that_Quant = { - s,sp = \\gn,c => "jen" + detEnding ! gn ! c ; a = Weak ; hasDefArt,delCardOne = False} ; + s,sp = \\gn,c => "jen" + detEnding ! gn ! c ; a = Weak ; isDefArt,delCardOne = False} ; ---b that_NP = nameNounPhrase Neutr {s = caselist "das" "das" "dem" "dessen"} ; ---- there_Adv = ss "da" ; --- no variants in the rgl | ss "dort" ; there7to_Adv = ss "dahin" ; @@ -112,7 +113,7 @@ concrete StructuralGer of Structural = CatGer ** ---b these_NP = {s = caselist "diese" "diese" "diesen" "dieser" ; a = agrP3 Pl} ; they_Pron = mkPronPers "sie" "sie" "ihnen" "ihrer" "ihr" Fem Pl P3 ; this_Quant = { - s,sp = \\gn,c => "dies" + detEnding ! gn ! c ; a = Weak ; hasDefArt, delCardOne = False} ; + s,sp = \\gn,c => "dies" + detEnding ! gn ! c ; a = Weak ; isDefArt, delCardOne = False} ; ---b this_NP = nameNounPhrase Neutr {s = caselist "dies" "dies" "diesem" "dieses"} ; ---- ---b those_NP = {s = caselist "jene" "jene" "jenen" "jener" ; a = agrP3 Pl} ; through_Prep = mkPrep "durch" P.accusative ; @@ -150,7 +151,7 @@ concrete StructuralGer of Structural = CatGer ** s = table {GSg g => \\c => "kein" + pronEnding ! GSg g ! c ; GPl => \\c => "kein" + detEnding ! GPl ! c} ; sp = \\gn,c => "kein" + detEnding ! gn ! c ; - a = Mixed ; hasDefArt = False ; delCardOne = True} ; -- HL kein+ein(er) => kein(er) + a = Mixed ; isDefArt = False ; delCardOne = True} ; -- HL kein+ein(er) => kein(er) if_then_Conj = {s1 = "wenn" ; s2 = "dann" ; n = Sg ; lock_Conj = <>} ; nobody_NP = nameNounPhrase Masc {s = caselist "niemand" "niemanden" "niemandem" "niemands"} ; diff --git a/src/german/TerminologyGer.gf b/src/german/TerminologyGer.gf index 569acd92..3c1f1ea4 100644 --- a/src/german/TerminologyGer.gf +++ b/src/german/TerminologyGer.gf @@ -1,7 +1,7 @@ --# -path=.:../abstract:../common concrete TerminologyGer of Terminology = CatGer ** open - ResGer, + (R = ResGer), ParadigmsGer, (G = GrammarGer), (S = SyntaxGer), @@ -59,8 +59,8 @@ lin superlative_Parameter = mkN "Superlativ" ; predicative_Parameter = mkN "Prädikativ" ; - nounHeading n = ss (n.s ! Sg ! Nom) ; + nounHeading n = ss (n.s ! R.Sg ! R.Nom) ; exampleGr_N = mkN "Beispiel" "Beispiele" neuter ; -} \ No newline at end of file +}