GitHub/gf-core
1
0
Fork 1
mirror of https://github.com/GrammaticalFramework/gf-core.git synced 2026-05-16 14:42:50 -06:00
Code Issues Packages Projects Releases Wiki Activity

fixed the word order of Scand discontious conjunctions: antinger jag vinner eller... -> antingen vinner jag eller...

Browse Source
This commit is contained in:
aarne
2015-05-22 11:31:57 +00:00
parent fc7c285e52
commit b57e5dcc12
8 changed files with 27 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
lib/src/swedish/MakeStructuralSwe.gf
View File

@@ -6,9 +6,11 @@ resource MakeStructuralSwe = open CatSwe,
oper
mkConj = overload {
mkConj : Str -> Conj
= \s -> lin Conj {s1 = [] ; s2 = s ; n = P.plural} ;
= \s -> lin Conj {s1 = [] ; s2 = s ; n = P.plural ; isDiscont = False} ;
mkConj : Str -> Str -> P.Number -> Conj
= \x,y,n -> {s1 = x ; s2 = y ; n = n ; lock_Conj = <>} ;
= \x,y,n -> lin Conj {s1 = x ; s2 = y ; n = n ; isDiscont = False} ;
mkConj : Str -> Str -> P.Number -> Bool -> Conj
= \x,y,n,d -> lin Conj {s1 = x ; s2 = y ; n = n ; isDiscont = d} ;
} ;
mkSubj : Str -> Subj

10
lib/src/swedish/StructuralSwe.gf
View File

@@ -13,19 +13,19 @@ concrete StructuralSwe of Structural = CatSwe **
almost_AdA, almost_AdN = ss "nästan" ;
although_Subj = ss "fast" ;
always_AdV = ss "alltid" ;
and_Conj = {s1 = [] ; s2 = "och" ; n = Pl} ;
and_Conj = {s1 = [] ; s2 = "och" ; n = Pl ; isDiscont = False} ;
because_Subj = ss "eftersom" ;
before_Prep = ss "före" ;
behind_Prep = ss "bakom" ;
between_Prep = ss "mellan" ;
both7and_DConj = sd2 "både" "och" ** {n = Pl} ;
both7and_DConj = sd2 "både" "och" ** {n = Pl ; isDiscont = True} ;
but_PConj = ss "men" ;
by8means_Prep = ss "med" ;
can8know_VV, can_VV =
mkV "kunna" "kan" "kunn" "kunde" "kunnat" "kunnen" **
{c2 = mkComplement [] ; lock_VV = <>} ;
during_Prep = ss "under" ;
either7or_DConj = sd2 "antingen" "eller" ** {n = Sg} ;
either7or_DConj = sd2 "antingen" "eller" ** {n = Sg ; isDiscont = True} ;
everybody_NP = regNP "alla" "allas" Utr Pl ;
every_Det = {
s = \\_,_ => "varje" ;
@@ -63,7 +63,7 @@ concrete StructuralSwe of Structural = CatSwe **
on_Prep = ss "på" ;
--- one_Quant = {s = \\_,_ => genderForms ["en"] ["ett"] ; n = Sg ; det = DIndef} ;
only_Predet = {s = \\_,_ => "bara" ; p = [] ; a = PNoAg} ;
or_Conj = {s1 = [] ; s2 = "eller" ; n = Sg} ;
or_Conj = {s1 = [] ; s2 = "eller" ; n = Sg ; isDiscont = False} ;
otherwise_PConj = ss "annars" ;
part_Prep = ss "av" ;
please_Voc = ss "tack" ; ---
@@ -142,7 +142,7 @@ lin
det = DIndef
} ;
if_then_Conj = {s1 = "om" ; s2 = "så" ; n = singular} ;
if_then_Conj = {s1 = "om" ; s2 = "så" ; n = singular ; isDiscont = False} ; ----
nobody_NP = regNP "ingen" "ingens" Utr Sg ;
nothing_NP = regNP "inget" "ingets" Neutr Sg ;