mirror of
https://github.com/GrammaticalFramework/gf-core.git
synced 2026-05-09 11:12:51 -06:00
fixed Scandinavian bugs in exx-resource
This commit is contained in:
@@ -68,9 +68,9 @@ instance DiffDan of DiffScand = open CommonScand, Prelude in {
|
||||
} ;
|
||||
|
||||
relPron : GenNum => RCase => Str = \\gn,c => case c of {
|
||||
RNom => "som" ;
|
||||
RNom | RPrep False => "som" ;
|
||||
RGen => "hvis" ;
|
||||
RPrep => gennumForms "hvilken" "hvilket" "hvilke" ! gn
|
||||
RPrep _ => gennumForms "hvilken" "hvilket" "hvilke" ! gn
|
||||
} ;
|
||||
|
||||
pronSuch = gennumForms "sådan" "sådant" "sådanne" ;
|
||||
|
||||
@@ -8,13 +8,10 @@ concrete IdiomDan of Idiom = CatDan **
|
||||
GenericCl vp = mkClause "man" (agrP3 MorphoDan.utrum Sg) vp ;
|
||||
|
||||
CleftNP np rs = mkClause "det" (agrP3 MorphoDan.neutrum Sg)
|
||||
(insertObj (\\_ => rs.s ! np.a)
|
||||
(insertObj (\\_ => np.s ! rs.c) (predV verbBe))) ;
|
||||
(insertObj (\\_ => np.s ! rs.c ++ rs.s ! np.a) (predV verbBe)) ;
|
||||
|
||||
CleftAdv ad s = mkClause "det" (agrP3 MorphoDan.neutrum Sg)
|
||||
(insertObj (\\_ => "som" ++ s.s ! Sub)
|
||||
(insertObj (\\_ => ad.s) (predV verbBe))) ;
|
||||
|
||||
(insertObj (\\_ => ad.s ++ s.s ! Sub) (predV verbBe)) ;
|
||||
|
||||
ExistNP np =
|
||||
mkClause "det" (agrP3 MorphoDan.neutrum Sg) (insertObj
|
||||
|
||||
@@ -327,9 +327,9 @@ oper
|
||||
|
||||
mk3N x y z = let u = ifTok Str x z "ene" "ne" in mk4N x y z (z + u) ;
|
||||
|
||||
mkN2 = \n,p -> n ** {lock_N2 = <> ; c2 = p.s} ;
|
||||
mkN2 = \n,p -> n ** {lock_N2 = <> ; c2 = mkComplement p.s} ;
|
||||
regN2 n g = mkN2 (regGenN n g) (mkPreposition "av") ;
|
||||
mkN3 = \n,p,q -> n ** {lock_N3 = <> ; c2 = p.s ; c3 = q.s} ;
|
||||
mkN3 = \n,p,q -> n ** {lock_N3 = <> ; c2 = mkComplement p.s ; c3 = mkComplement q.s} ;
|
||||
|
||||
mk2PN n g = {s = \\c => mkCase c n ; g = g} ** {lock_PN = <>} ;
|
||||
regPN n = mk2PN n utrum ;
|
||||
@@ -347,7 +347,7 @@ oper
|
||||
mk2A a b = mk3A a b (a + "e") ;
|
||||
regA a = (regADeg a) ** {lock_A = <>} ;
|
||||
|
||||
mkA2 a p = a ** {c2 = p.s ; lock_A2 = <>} ;
|
||||
mkA2 a p = a ** {c2 = mkComplement p.s ; lock_A2 = <>} ;
|
||||
|
||||
mkADeg a b c d e = mkAdject a b c d e ** {isComp = False ; lock_A = <>} ;
|
||||
|
||||
@@ -419,18 +419,18 @@ oper
|
||||
s = v.s ; part = v.part ; vtype = VRefl ; isVaere = False ; lock_V = <>
|
||||
} ;
|
||||
|
||||
mk2V2 v p = v ** {c2 = p.s ; lock_V2 = <>} ;
|
||||
mk2V2 v p = v ** {c2 = mkComplement p.s ; lock_V2 = <>} ;
|
||||
dirV2 v = mk2V2 v (mkPrep []) ;
|
||||
|
||||
mkV3 v p q = v ** {c2 = p.s ; c3 = q.s ; lock_V3 = <>} ;
|
||||
mkV3 v p q = v ** {c2 = mkComplement p.s ; c3 = mkComplement q.s ; lock_V3 = <>} ;
|
||||
dirV3 v p = mkV3 v noPrep p ;
|
||||
dirdirV3 v = dirV3 v noPrep ;
|
||||
|
||||
mkV0 v = v ** {lock_V0 = <>} ;
|
||||
mkVS v = v ** {lock_VS = <>} ;
|
||||
mkV2S v p = mk2V2 v p ** {lock_V2S = <>} ;
|
||||
mkVV v = v ** {c2 = "å" ; lock_VV = <>} ;
|
||||
mkV2V v p t = mk2V2 v p ** {c3 = "att" ; lock_V2V = <>} ;
|
||||
mkVV v = v ** {c2 = mkComplement "at" ; lock_VV = <>} ;
|
||||
mkV2V v p t = mk2V2 v p ** {c3 = mkComplement "at" ; lock_V2V = <>} ;
|
||||
mkVA v = v ** {lock_VA = <>} ;
|
||||
mkV2A v p = mk2V2 v p ** {lock_V2A = <>} ;
|
||||
mkVQ v = v ** {lock_VQ = <>} ;
|
||||
|
||||
@@ -21,7 +21,7 @@ concrete StructuralDan of Structural = CatDan **
|
||||
by8means_Prep = ss "med" ;
|
||||
can8know_VV, can_VV =
|
||||
mkV "kunne" "kan" "kan" "kunne" "kunnet" "kan" **
|
||||
{c2 = [] ; lock_VV = <>} ;
|
||||
{c2 = mkComplement [] ; lock_VV = <>} ;
|
||||
during_Prep = ss "under" ;
|
||||
either7or_DConj = sd2 "enten" "eller" ** {n = Sg} ;
|
||||
everybody_NP = regNP "alle" "alles" Plg ;
|
||||
@@ -50,7 +50,8 @@ concrete StructuralDan of Structural = CatDan **
|
||||
most_Predet = {s = gennumForms ["den meste"] ["det meste"] ["de fleste"]} ;
|
||||
much_Det = {s = \\_,_ => "meget" ; n = Pl ; det = DDef Indef} ;
|
||||
must_VV =
|
||||
mkV "måtte" "må" "må" "måtte" "måttet" "mått" ** {c2 = [] ; lock_VV = <>} ;
|
||||
mkV "måtte" "må" "må" "måtte" "måttet" "mått" **
|
||||
{c2 = mkComplement [] ; lock_VV = <>} ;
|
||||
no_Utt = ss ["nej"] ;
|
||||
on_Prep = ss "på" ;
|
||||
--- one_Quant = {s = \\_ => genderForms ["en"] ["et"] ; n = Sg ; det = DIndef} ; --- ei
|
||||
@@ -94,7 +95,7 @@ concrete StructuralDan of Structural = CatDan **
|
||||
very_AdA = ss "meget" ;
|
||||
want_VV =
|
||||
mkV "ville" "vil" "vil" "ville" "villet" "villed" **
|
||||
{c2 = [] ; lock_VV = <>} ;
|
||||
{c2 = mkComplement [] ; lock_VV = <>} ;
|
||||
we_Pron = MorphoDan.mkNP "vi" "os" "vores" "vores" "vores" Plg P1 ;
|
||||
whatSg_IP = {s = \\_ => "hvad" ; gn = SgUtr} ; ---- infl
|
||||
whatPl_IP = {s = \\_ => "hvilke" ; gn = Plg} ; ---- infl
|
||||
|
||||
Reference in New Issue
Block a user