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

fixed numeral agreement and some French verbs

Browse Source
This commit is contained in:
aarne
2005-03-14 09:46:22 +00:00
parent 049e8deca9
commit 4ee07b156e
18 changed files with 157 additions and 102 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
lib/resource/norwegian/MorphoNor.gf
View File

@@ -289,4 +289,6 @@ oper mkTal : Str -> Str -> Str -> {s : DForm => Str} =
{s = table {ental => två ; ton => tolv ; tiotal => tjugo}} ;
oper regTal : Str -> {s : DForm => Str} = \fem -> mkTal fem (fem + "ten") (fem + "ti") ;
numPl : Str -> {s : Gender => Str ; n : Number} = \n ->
{s = \\_ => n ; n = Pl} ;
}

36
lib/resource/norwegian/NumeralsNor.gf
View File

@@ -1,15 +1,15 @@
-- norsk bokmol, by Herman R Jervell herman.jervell@ilf.uio.no,
-- 6/3/2001
concrete NumeralsNor of Numerals = open Prelude, MorphoNor in {
concrete NumeralsNor of Numerals = open Prelude, TypesNor, MorphoNor in {
lincat Numeral = {s : Str} ;
lincat Numeral = {s : Gender => Str ; n : Number} ;
lincat Digit = {s : DForm => Str} ;
lincat Sub10 = {s : DForm => Str} ;
lincat Sub100 = {s : Str} ;
lincat Sub1000 = {s : Str} ;
lincat Sub1000000 = {s : Str} ;
lincat Sub10 = {s : DForm => Gender => Str ; n : Number} ;
lincat Sub100 = {s : Gender => Str ; n : Number} ;
lincat Sub1000 = {s : Gender => Str ; n : Number} ;
lincat Sub1000000 = {s : Gender => Str ; n : Number} ;
lin num x = x ;
@@ -22,20 +22,20 @@ lin n7 = mkTal "sju" "sytten" "sytti" ;
lin n8 = mkTal "åtte" "atten" "åtti" ;
lin n9 = mkTal "ni" "nitten" "nitti" ;
lin pot01 = {s = table {f => "et"}} ;
lin pot0 d = {s = table {f => d.s ! f}} ;
lin pot110 = ss "ti" ;
lin pot111 = ss "elve" ;
lin pot1to19 d = ss (d.s ! ton) ;
lin pot0as1 n = ss (n.s ! ental) ;
lin pot1 d = ss (d.s ! tiotal) ;
lin pot1plus d e = ss (d.s ! tiotal ++ e.s ! ental) ;
lin pot01 = {s = table {f => table {Neutr => "ett" ; _ => "én"}} ; n = Sg} ;
lin pot0 d = {s = \\f,g => d.s ! f ; n = Pl} ;
lin pot110 = numPl "ti" ;
lin pot111 = numPl "elve" ;
lin pot1to19 d = numPl (d.s ! ton) ;
lin pot0as1 n = {s = n.s ! ental ; n = n.n} ;
lin pot1 d = numPl (d.s ! tiotal) ;
lin pot1plus d e = {s = \\g => d.s ! tiotal ++ e.s ! ental ! g ; n = Pl} ;
lin pot1as2 n = n ;
lin pot2 d = ss (d.s ! ental ++ "hundre") ;
lin pot2plus d e = ss (d.s ! ental ++ "hundre" ++ "og" ++ e.s) ;
lin pot2 d = numPl (d.s ! ental ! Neutr ++ "hundre") ;
lin pot2plus d e = {s = \\g => d.s ! ental ! Neutr ++ "hundre" ++ "og" ++ e.s ! g ; n = Pl} ;
lin pot2as3 n = n ;
lin pot3 n = ss (n.s ++ "tusen") ;
lin pot3plus n m = ss (n.s ++ "tusen" ++ "og" ++ m.s) ;
lin pot3 n = numPl (n.s ! Neutr ++ "tusen") ;
lin pot3plus n m = {s = \\g => n.s ! Neutr ++ "tusen" ++ "og" ++ m.s ! g ; n = Pl} ;
}

2
lib/resource/norwegian/StructuralNor.gf
View File

@@ -8,7 +8,7 @@ concrete StructuralNor of Structural =
CategoriesNor, NumeralsNor ** open Prelude, MorphoNor, SyntaxNor in {
lin
UseNumeral i = {s = table {Nom => i.s ; Gen => i.s ++ "s"}} ; ---
UseNumeral i = {s = \\g => table {Nom => i.s ! g ; Gen => i.s ! g ++ "s"} ; n = i.n} ;
above_Prep = ss "ovenfor" ;
after_Prep = ss "etter" ;