From 5e2d2e61c34466c0fc785d20dd92cacad11015c9 Mon Sep 17 00:00:00 2001 From: aarne Date: Tue, 30 Mar 2010 21:48:24 +0000 Subject: [PATCH] moved phrases like 'I am hungry' from Greetings to Words to make them more general --- examples/phrasebook/Greetings.gf | 9 ++------- examples/phrasebook/GreetingsEng.gf | 5 ----- examples/phrasebook/GreetingsFin.gf | 5 ----- examples/phrasebook/GreetingsFre.gf | 5 ----- examples/phrasebook/GreetingsRon.gf | 5 ----- examples/phrasebook/GreetingsSwe.gf | 5 ----- examples/phrasebook/PhrasebookDisambEng.gf | 20 -------------------- examples/phrasebook/Words.gf | 6 ++++++ examples/phrasebook/WordsEng.gf | 5 +++++ examples/phrasebook/WordsFin.gf | 7 +++++++ examples/phrasebook/WordsFre.gf | 7 +++++++ examples/phrasebook/WordsIta.gf | 7 +++++++ examples/phrasebook/WordsRon.gf | 14 ++++++++++++++ examples/phrasebook/WordsSwe.gf | 5 +++++ examples/phrasebook/missing.txt | 2 +- examples/phrasebook/www/phrasebook.js | 4 ++-- 16 files changed, 56 insertions(+), 55 deletions(-) delete mode 100644 examples/phrasebook/PhrasebookDisambEng.gf diff --git a/examples/phrasebook/Greetings.gf b/examples/phrasebook/Greetings.gf index f9ac0d072..96e2c4e3c 100644 --- a/examples/phrasebook/Greetings.gf +++ b/examples/phrasebook/Greetings.gf @@ -12,7 +12,6 @@ fun GSorry, GSorryPol : Greeting ; GGoodbye : Greeting ; GBye : Greeting ; - GWhatsYourName : Greeting ; GNiceToMeetYou : Greeting ; GSeeYouSoon : Greeting ; GHelp : Greeting ; @@ -20,16 +19,12 @@ fun GGoodMorning : Greeting ; GGoodDay : Greeting ; GGoodEvening : Greeting ; - GGoodNight : Greeting ; - GImHungry : Greeting ; - GImThirsty : Greeting ; - GImTired : Greeting ; - GImScared : Greeting ; - GIdontUnderstand : Greeting ; + GGoodNight : Greeting ; GTheCheck : Greeting ; GYes : Greeting ; GNo : Greeting ; + GWhatsYourName : Greeting ; ---- move } diff --git a/examples/phrasebook/GreetingsEng.gf b/examples/phrasebook/GreetingsEng.gf index 6cc23de57..9ca8ca68a 100644 --- a/examples/phrasebook/GreetingsEng.gf +++ b/examples/phrasebook/GreetingsEng.gf @@ -21,11 +21,6 @@ lin GGoodDay = ss "good afternoon" ; ---- GGoodEvening = ss "good evening" ; GGoodNight = ss "good night" ; - GImHungry = ss "I'm hungry" ; - GImThirsty = ss "I'm thirsty" ; - GImTired = ss "I'm tired" ; - GImScared = ss "I'm scared" ; - GIdontUnderstand = ss "I don't understand" ; GTheCheck = ss "the bill" ; GYes = ss "yes" ; diff --git a/examples/phrasebook/GreetingsFin.gf b/examples/phrasebook/GreetingsFin.gf index f323beb98..d4c2417e3 100644 --- a/examples/phrasebook/GreetingsFin.gf +++ b/examples/phrasebook/GreetingsFin.gf @@ -24,11 +24,6 @@ lin GGoodDay = ss "hyvää päivää" ; GGoodEvening = ss "hyvää iltaa" ; GGoodNight = ss "hyvää yötä" ; - GImHungry = ss "minun on nälkä" ; - GImThirsty = ss "minun on jano" ; - GImTired = ss "minä olen väsynyt" ; - GImScared = ss "minua pelottaa" ; - GIdontUnderstand = ss "en ymmärrä" ; GTheCheck = ss "lasku" ; GYes = ss "kyllä" ; diff --git a/examples/phrasebook/GreetingsFre.gf b/examples/phrasebook/GreetingsFre.gf index 17946558c..50d04b4bf 100644 --- a/examples/phrasebook/GreetingsFre.gf +++ b/examples/phrasebook/GreetingsFre.gf @@ -25,11 +25,6 @@ lin GGoodDay = ss "bonjour" ; GGoodEvening = ss "bon soir" ; GGoodNight = ss "bonne nuit" ; - GImHungry = ss "j'ai faim" ; - GImThirsty = ss "j'ai soif" ; - GImTired = ss "je suis fatigué" ; ---- - GImScared = ss "j'ai peur" ; - GIdontUnderstand = ss "je ne comprends pas" ; GTheCheck = ss "l'addition" ; GYes = ss "oui" ; ---- si diff --git a/examples/phrasebook/GreetingsRon.gf b/examples/phrasebook/GreetingsRon.gf index 14aec6020..8e303a56a 100644 --- a/examples/phrasebook/GreetingsRon.gf +++ b/examples/phrasebook/GreetingsRon.gf @@ -23,11 +23,6 @@ lin GGoodDay = ss "bună ziua" ; GGoodEvening = ss "bună seara" ; GGoodNight = ss "noapte bună" ; - GImHungry = ss "mi-e foame" ; - GImThirsty = ss "mi-e sete" ; - GImTired = ss "mi-e somn" ; - GImScared = ss "mi-e frică" ; - GIdontUnderstand = ss "nu înÅ£eleg" ; GTheCheck = ss "nota de plată" ; GYes = ss "da" ; diff --git a/examples/phrasebook/GreetingsSwe.gf b/examples/phrasebook/GreetingsSwe.gf index 0967fb564..7319fdb58 100644 --- a/examples/phrasebook/GreetingsSwe.gf +++ b/examples/phrasebook/GreetingsSwe.gf @@ -22,11 +22,6 @@ lin GGoodNight = ss "god natt" ; GWhatsYourName = ss "vad heter du" ; - GImHungry = ss "jag är hungrig" ; - GImThirsty = ss "jag är törstig" ; - GImTired = ss "jag är trött" ; - GImScared = ss "jag är rädd" ; - GIdontUnderstand = ss "jag förstår inte" ; GTheCheck = ss "notan" ; diff --git a/examples/phrasebook/PhrasebookDisambEng.gf b/examples/phrasebook/PhrasebookDisambEng.gf deleted file mode 100644 index 17212ae6f..000000000 --- a/examples/phrasebook/PhrasebookDisambEng.gf +++ /dev/null @@ -1,20 +0,0 @@ ---# -path=.:present - -concrete PhrasebookDisambEng of Phrasebook = - PhrasebookEng - [PGreeting, Polite, Familiar, Male, Female] ** open - (R = Roles), - Prelude in { - -lin - PGreeting p s h g = mkPhrase - (g.s ++ p.s ++ "(by" ++ s.s ++ ")" ++ "(to" ++ h.s ++ ")") ; - - Male = {s = "a man" ; g = R.Male} ; - Female = {s = "a woman" ; g = R.Female} ; - Polite = {s = "(polite)" ; p = R.Polite} ; - Familiar = {s = "(familiar)" ; p = R.Familiar} ; - ---oper --- mkPhrase : Str -> Utt = \s -> lin Utt (ss s) ; - -} diff --git a/examples/phrasebook/Words.gf b/examples/phrasebook/Words.gf index 12fad7bc8..0967e8848 100644 --- a/examples/phrasebook/Words.gf +++ b/examples/phrasebook/Words.gf @@ -21,4 +21,10 @@ abstract Words = Sentences ** { ASpeak : Person -> Language -> Action ; ALove : Person -> Person -> Action ; + AHungry : Person -> Action ; + AThirsty : Person -> Action ; + ATired : Person -> Action ; + AScared : Person -> Action ; + AUnderstand : Person -> Action ; + } diff --git a/examples/phrasebook/WordsEng.gf b/examples/phrasebook/WordsEng.gf index 2e94eb4ff..d329aa365 100644 --- a/examples/phrasebook/WordsEng.gf +++ b/examples/phrasebook/WordsEng.gf @@ -39,5 +39,10 @@ concrete WordsEng of Words = SentencesEng ** ASpeak p lang = mkCl p (mkV2 IrregEng.speak_V) lang ; ALove p q = mkCl p (mkV2 (mkV "love")) q ; + AHungry p = mkCl p (mkA "hungry") ; + AThirsty p = mkCl p (mkA "thirsty") ; + ATired p = mkCl p (mkA "tired") ; + AScared p = mkCl p (mkA "scared") ; + AUnderstand p = mkCl p IrregEng.understand_V ; } diff --git a/examples/phrasebook/WordsFin.gf b/examples/phrasebook/WordsFin.gf index 140c7a343..245583f4d 100644 --- a/examples/phrasebook/WordsFin.gf +++ b/examples/phrasebook/WordsFin.gf @@ -42,4 +42,11 @@ concrete WordsFin of Words = SentencesFin ** French = mkNP (mkPN "ranska") ; Romanian = mkNP (mkPN "romania") ; Swedish = mkNP (mkPN "ruotsi") ; + + AHungry p = mkCl p have_V2 (mkNP (mkN "nälkä")) ; + AThirsty p = mkCl p have_V2 (mkNP (mkN "jano")) ; + ATired p = mkCl p (caseV partitive (mkV "väsyttää")) ; + AScared p = mkCl p (caseV partitive (mkV "pelottaa")) ; + AUnderstand p = mkCl p (mkV "ymmärtää") ; + } diff --git a/examples/phrasebook/WordsFre.gf b/examples/phrasebook/WordsFre.gf index 266d0ed6c..dbc537e71 100644 --- a/examples/phrasebook/WordsFre.gf +++ b/examples/phrasebook/WordsFre.gf @@ -4,6 +4,7 @@ concrete WordsFre of Words = SentencesFre ** open SyntaxFre, DiffPhrasebookFre, IrregFre, + (E = ExtraFre), ParadigmsFre in { flags coding=utf8 ; @@ -47,6 +48,12 @@ Boring = mkAPA "ennuyeux" ; Romanian = mkNP (mkPN "roumain") ; Swedish = mkNP (mkPN "suédois") ; + AHungry p = mkCl p (E.ComplCN have_V2 (mkCN (mkN "faim" feminine))) ; + AThirsty p = mkCl p (E.ComplCN have_V2 (mkCN (mkN "soif" feminine))) ; + ATired p = mkCl p (mkA "fatigué") ; + AScared p = mkCl p (E.ComplCN have_V2 (mkCN (mkN "peur" feminine))) ; + AUnderstand p = mkCl p (mkV IrregFre.comprendre_V2) ; + oper mkAPA : (_ : Str) -> AP = \x -> mkAP (mkA x) ; diff --git a/examples/phrasebook/WordsIta.gf b/examples/phrasebook/WordsIta.gf index 43a19c4fe..e9d21ae90 100644 --- a/examples/phrasebook/WordsIta.gf +++ b/examples/phrasebook/WordsIta.gf @@ -4,6 +4,7 @@ concrete WordsIta of Words = SentencesIta ** open SyntaxIta, DiffPhrasebookIta, BeschIta, + (E = ExtraIta), ParadigmsIta in { lin @@ -45,6 +46,12 @@ Boring = mkAPA "noioso" ; Romanian = mkNP (mkPN "romano") ; Swedish = mkNP (mkPN "svedese") ; + AHungry p = mkCl p (E.ComplCN have_V2 (mkCN (mkN "fame" feminine))) ; + AThirsty p = mkCl p (E.ComplCN have_V2 (mkCN (mkN "sete" feminine))) ; + ATired p = mkCl p (mkA "stanco") ; + AScared p = mkCl p (E.ComplCN have_V2 (mkCN (mkN "paura" feminine))) ; + AUnderstand p = mkCl p (mkV "capire") ; + oper mkAPA : (_ : Str) -> AP = \x -> mkAP (mkA x) ; diff --git a/examples/phrasebook/WordsRon.gf b/examples/phrasebook/WordsRon.gf index 922ee0e71..deb857b7c 100644 --- a/examples/phrasebook/WordsRon.gf +++ b/examples/phrasebook/WordsRon.gf @@ -3,6 +3,7 @@ concrete WordsRon of Words = SentencesRon ** open SyntaxRon, ParadigmsRon, + BeschRon, DiffPhrasebookRon in { flags coding=utf8 ; @@ -46,6 +47,19 @@ Boring = mkAPA "plictisitor" "plictisitoare" "plictisitori" "plictisitoare" ; Romanian = SyntaxRon.mkNP (mkPN "română") ; ---- ? -- Swedish = mkNP (mkPN "suédois") ; +-- AHungry p = mkCl p have_V2 (SyntaxRon.mkNP a_Det (mkN "foame")) ; +-- AThirsty p = mkCl p (E.ComplCN have_V2 (mkCN (mkN "sete" feminine))) ; +-- ATired p = mkCl p (mkA "stanco") ; +-- AScared p = mkCl p (E.ComplCN have_V2 (mkCN (mkN "paura" feminine))) ; + AUnderstand p = mkCl p (v_besch83 "înÅ£elege") ; +{- + GImHungry = ss "mi-e foame" ; + GImThirsty = ss "mi-e sete" ; + GImTired = ss "mi-e somn" ; + GImScared = ss "mi-e frică" ; +-} + + oper mkAPA : (_,_,_,_ : Str) -> AP = \x,y,z,u -> mkAP (mkA x y z u) ; diff --git a/examples/phrasebook/WordsSwe.gf b/examples/phrasebook/WordsSwe.gf index 19160d004..09df8c220 100644 --- a/examples/phrasebook/WordsSwe.gf +++ b/examples/phrasebook/WordsSwe.gf @@ -39,5 +39,10 @@ concrete WordsSwe of Words = SentencesSwe ** ASpeak p lang = mkCl p (mkV2 (mkV "tala")) lang ; ALove p q = mkCl p (mkV2 (mkV "älska")) q ; + AHungry p = mkCl p (mkA "hungrig") ; + AThirsty p = mkCl p (mkA "törstig") ; + ATired p = mkCl p (mkA "trött") ; + AScared p = mkCl p (mkA "rädd") ; + AUnderstand p = mkCl p (mkV "förstå" "förstod" "förstått") ; } diff --git a/examples/phrasebook/missing.txt b/examples/phrasebook/missing.txt index 920dc0876..13a0ceae9 100644 --- a/examples/phrasebook/missing.txt +++ b/examples/phrasebook/missing.txt @@ -3,5 +3,5 @@ PhrasebookEng : PhrasebookFin : PhrasebookFre : PhrasebookIta : GNiceToMeetYou GSeeYouSoon Tea -PhrasebookRon : Coffee Finnish French GExcusePol GPleaseGivePol GSorryPol Swedish Tea +PhrasebookRon : AHungry AScared AThirsty ATired Coffee Finnish French GExcusePol GPleaseGivePol GSorryPol Swedish Tea PhrasebookSwe : GExcusePol GPleaseGivePol GSorryPol diff --git a/examples/phrasebook/www/phrasebook.js b/examples/phrasebook/www/phrasebook.js index b02180035..c39dca7c0 100644 --- a/examples/phrasebook/www/phrasebook.js +++ b/examples/phrasebook/www/phrasebook.js @@ -53,8 +53,8 @@ function show_languages(grammar) { menu.setAttribute("onchange","new_language(this)"); menu.grammar=grammar; menu.innerHTML=""; - for(var i=1; i