diff --git a/examples/phrasebook/SentencesDan.gf b/examples/phrasebook/SentencesDan.gf index 6ddb444c3..8b8804e09 100644 --- a/examples/phrasebook/SentencesDan.gf +++ b/examples/phrasebook/SentencesDan.gf @@ -1,4 +1,8 @@ -concrete SentencesDan of Sentences = NumeralDan ** SentencesI with +concrete SentencesDan of Sentences = NumeralDan ** SentencesI - [NameNN] with (Syntax = SyntaxDan), (Symbolic = SymbolicDan), - (Lexicon = LexiconDan) ; + (Lexicon = LexiconDan) ** open Prelude, SyntaxDan, (P = ParadigmsDan) in { + + lin NameNN = mkNP (P.mkPN "NN") ; + +} diff --git a/examples/phrasebook/SentencesNor.gf b/examples/phrasebook/SentencesNor.gf index 62f0d6c90..cd8b068c1 100644 --- a/examples/phrasebook/SentencesNor.gf +++ b/examples/phrasebook/SentencesNor.gf @@ -1,4 +1,10 @@ -concrete SentencesNor of Sentences = NumeralNor ** SentencesI with +concrete SentencesNor of Sentences = NumeralNor ** SentencesI - [NameNN] with (Syntax = SyntaxNor), (Symbolic = SymbolicNor), - (Lexicon = LexiconNor) ; + (Lexicon = LexiconNor) ** open SyntaxNor, (P = ParadigmsNor) in + +{ + +lin NameNN = mkNP (P.mkPN "NN") ; + +} diff --git a/examples/phrasebook/SentencesSwe.gf b/examples/phrasebook/SentencesSwe.gf index 98b4eb4bf..7a95e439f 100644 --- a/examples/phrasebook/SentencesSwe.gf +++ b/examples/phrasebook/SentencesSwe.gf @@ -1,8 +1,9 @@ -concrete SentencesSwe of Sentences = NumeralSwe ** SentencesI - [PYesToNo] with +concrete SentencesSwe of Sentences = NumeralSwe ** SentencesI - [PYesToNo,NameNN] with (Syntax = SyntaxSwe), (Symbolic = SymbolicSwe), - (Lexicon = LexiconSwe) ** open Prelude in { + (Lexicon = LexiconSwe) ** open Prelude, SyntaxSwe, (P = ParadigmsSwe) in { lin PYesToNo = mkPhrase (lin Utt (ss "jo")) ; + lin NameNN = mkNP (P.mkPN "NN") ; } diff --git a/examples/phrasebook/WordsDan.gf b/examples/phrasebook/WordsDan.gf index b44ba3dcd..b568b072c 100644 --- a/examples/phrasebook/WordsDan.gf +++ b/examples/phrasebook/WordsDan.gf @@ -133,7 +133,7 @@ concrete WordsDan of Words = SentencesDan ** AHasTable p num = mkCl p.name have_V2 (mkNP (mkNP a_Det (mkN "bord")) (SyntaxDan.mkAdv to_Prep (mkNP num (mkN "person" "personen" "personer" "personerne")))) ; - AHungry p = mkCl p.name (mkA "sulten") ; + AHungry p = mkCl p.name (mkA "sulten" "sultet" "sultne") ; AIll p = mkCl p.name (mkA "syg") ; AKnow p = mkCl p.name vide_V ; ALike p item = mkCl p.name (mkV2 holde_V (mkPrep "af")) item ; diff --git a/examples/phrasebook/WordsNor.gf b/examples/phrasebook/WordsNor.gf index 2504602e4..9c63f9d39 100644 --- a/examples/phrasebook/WordsNor.gf +++ b/examples/phrasebook/WordsNor.gf @@ -32,7 +32,7 @@ concrete WordsNor of Words = SentencesNor ** Expensive = mkA "dyr" ; Fresh = mkA "fersk" ; Good = L.good_A ; - Suspect = mkA "suspekt" ; + Suspect = mkA "suspekt" "suspekt" ; Warm = L.warm_A ; -- places @@ -131,9 +131,9 @@ concrete WordsNor of Words = SentencesNor ** (mkNP (mkNP a_Det (mkN "rom" "rommet" "rommene" "romma")) (SyntaxNor.mkAdv for_Prep (mkNP num (mkN "person" "personen" "personer" "personene")))) ; AHasTable p num = mkCl p.name have_V2 - (mkNP (mkNP a_Det (mkN "tabel" "tabellen" "tabeller" "tabellene")) + (mkNP (mkNP a_Det (mkN "bord" "bordet" "bord" "borda")) (SyntaxNor.mkAdv for_Prep (mkNP num (mkN "person" "personen" "personer" "personene")))) ; - AHungry p = mkCl p.name (mkA "sulten") ; + AHungry p = mkCl p.name (mkA "sulten" "sultet" "sultne") ; AIll p = mkCl p.name (mkA "syk") ; AKnow p = mkCl p.name vite_V ; ALike p item = mkCl p.name (dirV2 (mk2V "like" "likte")) item ; @@ -143,7 +143,7 @@ concrete WordsNor of Words = SentencesNor ** AReady p = mkCl p.name (mkA "klar") ; AScared p = mkCl p.name (mkA "redd") ; ASpeak p lang = mkCl p.name (dirV2 (regV "snakke")) lang ; - AThirsty p = mkCl p.name (mkA "tørst") ; + AThirsty p = mkCl p.name (mkA "tørstig") ; ATired p = mkCl p.name (mkA "sliten") ; AUnderstand p = mkCl p.name (irregV "forstå" "forstod" "forstått") ; AWant p obj = mkCl p.name want_VV (mkVP have_V2 obj) ; @@ -251,7 +251,7 @@ concrete WordsNor of Words = SentencesNor ** mkTransport : N -> {name : CN ; by : Adv} = \n -> { name = mkCN n ; - by = SyntaxNor.mkAdv by8means_Prep (mkNP n) + by = SyntaxNor.mkAdv by8means_Prep (mkNP the_Det n) } ; far_IAdv = ExtraNor.IAdvAdv (ParadigmsNor.mkAdv "langt") ; diff --git a/examples/phrasebook/WordsSwe.gf b/examples/phrasebook/WordsSwe.gf index 1515f75ed..747a5e55d 100644 --- a/examples/phrasebook/WordsSwe.gf +++ b/examples/phrasebook/WordsSwe.gf @@ -108,7 +108,7 @@ concrete WordsSwe of Words = SentencesSwe ** Car = mkTransport L.car_N ; Ferry = mkTransport (mkN "färja") ; Plane = mkTransport L.airplane_N ; - Subway = mkTransport (mkN "metro" "metron" "metro" "metrona") ; ---- + Subway = mkTransport (mkN "tunnelbana") ; Taxi = mkTransport (mkN "taxi" "taxin" "taxibilar" "taxibilarna") ; ---- Train = mkTransport L.train_N ; Tram = mkTransport (mkN "spårvagn") ;