diff --git a/src/german/NamesGer.gf b/src/german/NamesGer.gf index 0d9c1774..9b4ecc31 100644 --- a/src/german/NamesGer.gf +++ b/src/german/NamesGer.gf @@ -3,28 +3,28 @@ concrete NamesGer of Names = CatGer ** open ResGer, Prelude in { lin GivenName gn = { s = \\_,c => gn.s ! c ; a = agrgP3 (sex2gender gn.g) Sg ; - w = WLight ; + w = WLight ; rc, ext = [] } ; lin MaleSurname sn = { s = \\_,c => sn.s ! Male ! c ; a = agrgP3 Masc Sg ; - w = WLight ; + w = WLight ; rc, ext = [] } ; - + lin FemaleSurname sn = { s = \\_,c => sn.s ! Female ! c ; a = agrgP3 Fem Sg ; - w = WLight ; + w = WLight ; rc, ext = [] } ; lin PlSurname sn = { s = \\_,c => sn.s ! Male ! c ; a = agrgP3 Masc Pl ; - w = WLight ; + w = WLight ; rc, ext = [] } ; @@ -35,33 +35,43 @@ lin FullName gn sn = { rc, ext = [] } ; -lin UseLN ln = { +-- UseLN : LN -> NP ; +lin UseLN ln = notYet "UseLN" ; +{- Old version by Krasimir: { s = \\c => case ln.hasArt of { True => artDefContr (gennum ln.g ln.n) c ++ usePrepC c (\k -> ln.s ! Weak ! k) ; False => usePrepC c (\k -> ln.s ! adjfCase Strong k ! k) } ; a = agrgP3 ln.g ln.n ; - w = WLight ; + w = WLight ; rc, ext = [] } ; +-} -lin PlainLN ln = { +-- PlainLN : LN -> NP ; +lin PlainLN ln = notYet "PlainLN" ; +{- { s = \\c => usePrepC c (\k -> ln.s ! adjfCase Strong k ! k) ; a = agrgP3 ln.g ln.n ; - w = WLight ; + w = WLight ; rc, ext = [] } ; +-} -lin InLN ln = { +-- InLN : LN -> Adv ; +lin InLN ln = notYet "InLN" ; +{- { s = let c = NPP CInDat in case ln.hasArt of { True => artDefContr (gennum ln.g ln.n) c ++ usePrepC c (\k -> ln.s ! Weak ! k) ; False => usePrepC c (\k -> ln.s ! adjfCase Strong k ! k) } ; } ; +-} +-- AdjLN : AP -> LN -> LN ; lin AdjLN ap ln = ln ** { - s = \\a,c => + s = \\a,c => preOrPost ap.isPre (ap.c.p1 ++ ap.c.p2 ++ ap.s ! agrAdj ln.g a ln.n c ++ ap.ext) (ln.s ! a ! c) ;