msyds/gf-core
1
0
Fork 0
forked from GitHub/gf-core
Code Pull Requests Activity

fixed Scandinavian bugs in exx-resource

Browse Source
This commit is contained in:
aarne
2008-06-20 20:42:26 +00:00
parent 2f8a83b883
commit 23793d3353
24 changed files with 101 additions and 92 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
lib/resource-1.4/norwegian/DiffNor.gf
View File

@@ -72,9 +72,9 @@ instance DiffNor 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" ;

6
lib/resource-1.4/norwegian/IdiomNor.gf
View File

@@ -9,12 +9,10 @@ concrete IdiomNor of Idiom = CatNor **
GenericCl vp = mkClause "man" (agrP3 utrum Sg) vp ;
CleftNP np rs = mkClause "det" (agrP3 ParadigmsNor.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 ParadigmsNor.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 ParadigmsNor.neutrum Sg) (insertObj

2
lib/resource-1.4/norwegian/LexiconNor.gf
View File

@@ -100,7 +100,7 @@ lin
important_A = regADeg "viktig" ;
industry_N = mk2N "industri" "industrien" ;
iron_N = regGenN "jern" neutrum ;
john_PN = mkPN "John" utrum ;
john_PN = mkPN "John" masculine ;
king_N = regGenN "konge" masculine ;
know_V2 = dirV2 IrregNor.vite_V ;
lake_N = regGenN "vann" neutrum ;

14
lib/resource-1.4/norwegian/ParadigmsNor.gf
View File

@@ -312,9 +312,9 @@ oper
} ;
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) (mkPrep "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} ;
regGenPN n g = {s = \\c => mkCase c n ; g = g} ** {lock_PN = <>} ;
regPN n = regGenPN n utrum ;
@@ -332,7 +332,7 @@ oper
mk2A a b = mk3A a b (a + "e") ;
regA a = (regADeg a) ** {isComp = False ; 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 = <>} ;
regADeg a = case Predef.dp 2 a of {
@@ -404,18 +404,18 @@ oper
depV v = {s = v.s ; part = v.part ; vtype = VPass ; isVaere = False ; lock_V = <>} ;
reflV v = {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 noPrep ;
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 "å" ; lock_VV = <>} ;
mkV2V v p t = mk2V2 v p ** {c3 = mkComplement "att" ; lock_V2V = <>} ;
mkVA v = v ** {lock_VA = <>} ;
mkV2A v p = mk2V2 v p ** {lock_V2A = <>} ;
mkVQ v = v ** {lock_VQ = <>} ;

7
lib/resource-1.4/norwegian/StructuralNor.gf
View File

@@ -21,7 +21,7 @@ concrete StructuralNor of Structural = CatNor **
by8means_Prep = ss "med" ;
can8know_VV, can_VV =
mkV "kunne" "kan" "kunn" "kunne" "kunnet" "kunnen" **
{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 StructuralNor of Structural = CatNor **
most_Predet = {s = gennumForms ["den meste"] ["det meste"] ["de fleste"]} ;
much_Det = {s = \\_,_ => "mye" ; 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 ["nei"] ;
on_Prep = ss "på" ;
--- one_Quant = {s = \\_ => genderForms ["en"] ["et"] ; n = Sg ; det = DIndef} ; DEPREC
@@ -94,7 +95,7 @@ concrete StructuralNor of Structural = CatNor **
very_AdA = ss "mye" ;
want_VV =
mkV "ville" "vil" "vill" "ville" "villet" "villed" **
{c2 = [] ; lock_VV = <>} ;
{c2 = mkComplement [] ; lock_VV = <>} ;
we_Pron = MorphoNor.mkNP "vi" "oss" "vår" "vårt" "våre" Plg P1 ;
whatSg_IP = {s = \\_ => "hva" ; gn = SgUtr} ; ---- infl
whatPl_IP = {s = \\_ => "hva" ; gn = Plg} ; ---- infl