GitHub/gf-rgl
1
0
Fork 1
mirror of https://github.com/GrammaticalFramework/gf-rgl.git synced 2026-05-28 01:18:57 -06:00
Code Issues Packages Projects Releases Wiki Activity

handle the full definitive article with Masc nouns

Browse Source
This commit is contained in:
Krasimir Angelov
2023-08-29 15:08:45 +02:00
parent 819d4f19ed
commit b72ea1e2f1
4 changed files with 43 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/bulgarian/CatBul.gf
View File

@@ -89,7 +89,7 @@ concrete CatBul of Cat = CommonX - [IAdv,AdV] ** open ResBul, Prelude, Predef, (
N3 = {s : NForm => Str; rel : AForm => Str; relType : NRelType; g : AGender} ** {c2,c3 : Preposition} ; N3 = {s : NForm => Str; rel : AForm => Str; relType : NRelType; g : AGender} ** {c2,c3 : Preposition} ;
GN = {s : Str; g : Sex} ; GN = {s : Str; g : Sex} ;
SN = {s : Sex => Str; pl : Str} ; SN = {s : Sex => Str; pl : Str} ;
LN = {s : Species => Str; onPrep : Bool; gn : GenNum} ; LN = {s : Species => Str; defNom: Str; onPrep : Bool; hasArt : Bool; gn : GenNum} ;
PN = {s : Str; gn : GenNum} ; PN = {s : Str; gn : GenNum} ;
lindef lindef

16
src/bulgarian/DocumentationBul.gf
View File

@@ -69,7 +69,10 @@ lin
tr (intagAttr "th" "rowspan=\"3\"" "ед.ч." ++ tr (intagAttr "th" "rowspan=\"3\"" "ед.ч." ++
th "нечленувано" ++ td (n.s ! (NF Sg Indef))) ++ th "нечленувано" ++ td (n.s ! (NF Sg Indef))) ++
tr (th "членувано" ++ td (n.s ! (NF Sg Def))) ++ tr (th "членувано" ++ td (n.s ! (NF Sg Def))) ++
tr (th "пълен член" ++ td (n.s ! NFSgDefNom)) ++ (case n.g of {
AMasc _ => tr (th "пълен член" ++ td (n.s ! NFSgDefNom)) ;
_ => ""
}) ++
tr (intagAttr "th" "rowspan=\"2\"" "мн.ч." ++ tr (intagAttr "th" "rowspan=\"2\"" "мн.ч." ++
th "нечленувано" ++ td (n.s ! (NF Pl Indef))) ++ th "нечленувано" ++ td (n.s ! (NF Pl Indef))) ++
tr (th "членувано" ++ td (n.s ! (NF Pl Def))) ++ tr (th "членувано" ++ td (n.s ! (NF Pl Def))) ++
@@ -101,7 +104,16 @@ lin
GSg Neut => "(ср.р.)" ; GSg Neut => "(ср.р.)" ;
GPl => "(мн.ч.)" GPl => "(мн.ч.)"
}) ; }) ;
s2 = paragraph (n.s ! Indef) ++ s2 = paragraph (case n.hasArt of {
True => frameTable (
tr (th "нечленувано" ++ td (n.s ! Indef)) ++
tr (th "членувано" ++ td (n.s ! Def)) ++
(case n.gn of {
GSg Masc => tr (th "пълен член" ++ td n.defNom) ;
_ => ""
})) ;
False => n.s ! Indef
}) ++
heading1 ("Наречие") ++ heading1 ("Наречие") ++
paragraph (case n.onPrep of { paragraph (case n.onPrep of {
True => linCase Dat Pos ; True => linCase Dat Pos ;

10
src/bulgarian/MorphoFunsBul.gf
View File

@@ -292,13 +292,15 @@ oper
} ; } ;
mkLN = overload { mkLN = overload {
mkLN : Str -> LN = \s -> lin LN {s = \\_ => s; onPrep = False; gn = GSg Masc} ; mkLN : Str -> LN = \s -> lin LN {s = \\_ => s; defNom=s; onPrep = False; hasArt = False; gn = GSg Masc} ;
mkLN : Str -> Gender -> LN = mkLN : Str -> Gender -> LN =
\s,g -> lin LN {s = \\_ => s; onPrep = False; gn = GSg g} ; \s,g -> lin LN {s = \\_ => s; defNom=s; onPrep = False; hasArt = False; gn = GSg g} ;
mkLN : Str -> GenNum -> LN = mkLN : Str -> GenNum -> LN =
\s,gn -> lin LN {s = \\_ => s; onPrep = False; gn = gn} ; \s,gn -> lin LN {s = \\_ => s; defNom=s; onPrep = False; hasArt = False; gn = gn} ;
mkLN : Str -> Str -> GenNum -> LN = mkLN : Str -> Str -> GenNum -> LN =
\s1,s2,gn -> lin LN {s = table Species [s2; s1]; onPrep = False; gn = gn} ; \s1,s2,gn -> lin LN {s = table Species [s2; s1]; defNom=s2; onPrep = False; hasArt = True; gn = gn} ;
mkLN : Str -> Str -> Str -> LN =
\s1,s2,s3 -> lin LN {s = table Species [s3; s2]; defNom=s1; onPrep = False; hasArt = True; gn = GSg Masc} ;
} ; } ;
onLN : LN -> LN = \n -> n ** {onPrep = True} ; onLN : LN -> LN = \n -> n ** {onPrep = True} ;

29
src/bulgarian/NamesBul.gf
View File

@@ -36,9 +36,18 @@ lin FullName gn sn = {
p = NounP3 Pos p = NounP3 Pos
} ; } ;
lin UseLN, PlainLN = \n -> { lin UseLN = \n -> {
s = table { RObj c => linCase c Pos ++ n.s ! Def ; s = table { RSubj => n.defNom ;
_ => n.s ! Def RObj c => linCase c Pos ++ n.s ! Def ;
RVoc => n.s ! Indef
} ;
gn = n.gn ;
p = NounP3 Pos
} ;
lin PlainLN = \n -> {
s = table { RObj c => linCase c Pos ++ n.s ! Indef ;
_ => n.s ! Indef
} ; } ;
gn = n.gn ; gn = n.gn ;
p = NounP3 Pos p = NounP3 Pos
@@ -53,10 +62,16 @@ lin UseLN, PlainLN = \n -> {
} ; } ;
AdjLN ap n = n ** { AdjLN ap n = n ** {
s = \\sp => case ap.isPre of { s = \\sp => case <ap.isPre,n.hasArt> of {
True => ap.s ! aform n.gn sp RSubj ! P3 ++ n.s ! Indef ; <True,True > => ap.s ! aform n.gn sp RSubj ! P3 ++ n.s ! Indef ;
False => n.s ! sp ++ ap.s ! aform n.gn sp RSubj ! P3 <True,False> => ap.s ! aform n.gn Indef RSubj ! P3 ++ n.s ! Indef ;
} <False,_> => n.s ! sp ++ ap.s ! aform n.gn Indef RSubj ! P3
} ;
defNom = case <ap.isPre,n.hasArt> of {
<True,True > => ap.s ! ASgMascDefNom ! P3 ++ n.s ! Indef ;
<True,False> => ap.s ! aform n.gn Indef RSubj ! P3 ++ n.s ! Indef ;
<False,_> => n.defNom ++ ap.s ! aform n.gn Indef RSubj ! P3
} ;
} ; } ;
} }