diff --git a/examples/phrasebook/WordsNor.gf b/examples/phrasebook/WordsNor.gf index 25300288d..cf9b2b371 100644 --- a/examples/phrasebook/WordsNor.gf +++ b/examples/phrasebook/WordsNor.gf @@ -7,12 +7,12 @@ concrete WordsNor of Words = SentencesNor ** -- kinds of food - Apple = mkCN L.apple_N ; + Apple = mkCN (mkN "eple" "eplet" "epler" "eplene") ; Beer = mkCN L.beer_N ; Bread = mkCN L.bread_N ; Cheese = mkCN (mkN "ost" "osten" "oster" "ostene") ; Chicken = mkCN (mkN "kylling" "kyllingen" "kyllinger" "kyllingene") ; - Coffee = mkCN (mkN "kaffe" "kaffen" "kaffe" "kaffe") ; -- av kaffe ? + Coffee = mkCN (mkN "kaffe" "kaffet" "kaffen" "kaffene") ; -- av kaffe ? Fish = mkCN L.fish_N ; Meat = mkCN (mkN "kjøtt" "kjøttet" "kjøtt" "kjøtta") ; Milk = mkCN L.milk_N ; @@ -87,7 +87,7 @@ concrete WordsNor of Words = SentencesNor ** Belgian = mkA "belgisk" ; Belgium = mkNP (mkPN "Belgia") ; Bulgarian = mkNat "bulgarsk" "Bulgaria" ; - Catalan = mkNat "katalansk" "Catalonia" ; + Catalan = mkNat "katalansk" "Katalonia" ; Danish = mkNat "dansk" "Danmark" ; Dutch = mkNat "nederlandsk" "Nederland" ; English = mkNat "engelsk" "England" ; diff --git a/examples/phrasebook/WordsSwe.gf b/examples/phrasebook/WordsSwe.gf index 747a5e55d..c235be5b9 100644 --- a/examples/phrasebook/WordsSwe.gf +++ b/examples/phrasebook/WordsSwe.gf @@ -226,7 +226,7 @@ concrete WordsSwe of Words = SentencesSwe ** mkNPDay day (SyntaxSwe.mkAdv on_Prep day) (SyntaxSwe.mkAdv on_Prep (mkNP a_Quant plNum (mkCN (mkN d)))) ; - mkPlace : N -> Str -> {name : CN ; at : Prep ; to : Prep} = \p,i -> + mkPlace : N -> Str -> {name : CN ; at : Prep ; to : Prep ; isPl : Bool} = \p,i -> mkCNPlace (mkCN p) (mkPrep i) to_Prep ; open_A = mkA "öppen" "öppet" ;