small fixes in Phrasebook, particularly PSeeYouPlaceDate

9 files changed, 34 insertions, 23 deletions

diff --git a/examples/phrasebook/Words.gf b/examples/phrasebook/Words.gf
index 224d7fc05..1fe7a4d8b 100644
--- a/examples/phrasebook/Words.gf
+++ b/examples/phrasebook/Words.gf
@@ -157,8 +157,11 @@ abstract Words = Sentences ** {
     PropOpenDay    : Place -> Day  -> Proposition ;  -- the museum is open on Mondays
     PropClosedDay  : Place -> Day  -> Proposition ;  -- the museum is closed on Mondays
 
-    PSeeYou      : Date -> Phrase ;           -- see you on Monday
-    PSeeYouPlace : Place -> Date -> Phrase ;  -- see you in the bar on Monday
+    PSeeYouPlaceDate : Place -> Date -> Phrase ;     -- see you in the bar on Monday
+    PSeeYouPlace     : Place         -> Phrase ;     -- see you in the bar
+    PSeeYouDate      :          Date -> Phrase ;     -- see you on Monday
+
+
 
 -- family relations
 
diff --git a/examples/phrasebook/WordsDut.gf b/examples/phrasebook/WordsDut.gf
index 0d5e52ebe..0a4549498 100644
--- a/examples/phrasebook/WordsDut.gf
+++ b/examples/phrasebook/WordsDut.gf
@@ -161,8 +161,10 @@ ik ga te voet/ ik ga lopend
 -- Building phrases from strings is complicated: the solution is to use
 -- mkText : Text -> Text -> Text ;
 
-    PSeeYou d = mkText (lin Text (ss ("tot"))) (mkPhrase (mkUtt d)) ; -- zie je / tot 
-    PSeeYouPlace p d = 
+    PSeeYouDate d = mkText (lin Text (ss ("tot"))) (mkPhrase (mkUtt d)) ; -- zie je / tot 
+    PSeeYouPlace p = 
+      mkText (lin Text (ss ("tot ziens"))) (mkPhrase (mkUtt p.at)) ; -- tot ziens in p (AR) 
+    PSeeYouPlaceDate p d = 
       mkText (lin Text (ss ("tot"))) 
         (mkText (mkPhrase (mkUtt p.at)) (mkPhrase (mkUtt d))) ; --tot ... op/in/bij
 
@@ -208,7 +210,7 @@ ik ga te voet/ ik ga lopend
     HowFarFromBy x y t = 
       mkQS (mkQCl long_IAdv (mkNP (mkNP y.name (SyntaxDut.mkAdv from_Prep x.name)) t)) ;
 --hoelang duurt het om van het vliegveld naar het hotel te gaan per taxi
-    HowFarBy y t = mkQS (mkQCl far_IAdv (mkNP y.name t.by)) ; --hoe ver is het museum per bus
+    HowFarBy y t = mkQS (mkQCl far_IAdv (mkNP y.name t)) ; --hoe ver is het museum per bus
  
     WhichTranspPlace trans place = 
       mkQS (mkQCl (mkIP which_IDet trans.name) (mkVP (mkVP L.go_V) place.to)) ;
diff --git a/examples/phrasebook/WordsEng.gf b/examples/phrasebook/WordsEng.gf
index 620164472..80435eb06 100644
--- a/examples/phrasebook/WordsEng.gf
+++ b/examples/phrasebook/WordsEng.gf
@@ -164,8 +164,9 @@ concrete WordsEng of Words = SentencesEng **
 -- Building phrases from strings is complicated: the solution is to use
 -- mkText : Text -> Text -> Text ;
 
-    PSeeYou d = mkText (lin Text (ss ("see you"))) (mkPhrase (mkUtt d)) ;
-    PSeeYouPlace p d = 
+    PSeeYouDate d = mkText (lin Text (ss ("see you"))) (mkPhrase (mkUtt d)) ;
+    PSeeYouPlace p = mkText (lin Text (ss ("see you"))) (mkPhrase (mkUtt p.at)) ;
+    PSeeYouPlaceDate p d = 
       mkText (lin Text (ss ("see you"))) 
         (mkText (mkPhrase (mkUtt p.at)) (mkPhrase (mkUtt d))) ;
 
@@ -209,7 +210,7 @@ concrete WordsEng of Words = SentencesEng **
     HowFarFrom x y = mkQS (mkQCl far_IAdv (mkNP y.name (SyntaxEng.mkAdv from_Prep x.name))) ;
     HowFarFromBy x y t = 
       mkQS (mkQCl far_IAdv (mkNP (mkNP y.name (SyntaxEng.mkAdv from_Prep x.name)) t)) ;
-    HowFarBy y t = mkQS (mkQCl far_IAdv (mkNP y.name t.by)) ;
+    HowFarBy y t = mkQS (mkQCl far_IAdv (mkNP y.name t)) ;
  
     WhichTranspPlace trans place = 
       mkQS (mkQCl (mkIP which_IDet trans.name) (mkVP (mkVP L.go_V) place.to)) ;
diff --git a/examples/phrasebook/WordsFin.gf b/examples/phrasebook/WordsFin.gf
index e4af6675f..995030707 100644
--- a/examples/phrasebook/WordsFin.gf
+++ b/examples/phrasebook/WordsFin.gf
@@ -164,8 +164,9 @@ concrete WordsFin of Words = SentencesFin **
 -- Building phrases from strings is complicated: the solution is to use
 -- mkText : Text -> Text -> Text ;
 
-    PSeeYou d = mkText (lin Text (ss ("nähdään"))) (mkPhrase (mkUtt d)) ;
-    PSeeYouPlace p d = 
+    PSeeYouDate d = mkText (lin Text (ss ("nähdään"))) (mkPhrase (mkUtt d)) ;
+    PSeeYouPlace p = mkText (lin Text (ss ("nähdään"))) (mkPhrase (mkUtt p.at)) ;
+    PSeeYouPlaceDate p d = 
       mkText (lin Text (ss ("nähdään"))) 
         (mkText (mkPhrase (mkUtt p.at)) (mkPhrase (mkUtt d))) ;
 
@@ -203,12 +204,12 @@ concrete WordsFin of Words = SentencesFin **
       mkQS (mkQCl far_IAdv (mkCl place.name t)) ;
       -- mkQS (mkQCl (mkIAdv far_IAdv t) y.name) ; 
 
-    ---- TODO: meneekö keskustaan busseja
     WhichTranspPlace trans place = 
       mkQS (mkQCl (mkIP which_IDet trans.name) (mkVP (mkVP L.go_V) place.to)) ;
 
     IsTranspPlace trans place =
-      mkQS (mkQCl (mkCl (mkCN trans.name place.to))) ;
+      mkQS (mkQCl (E.AdvPredNP place.to L.go_V (E.PartCN (trans.name)))) ; 
+      -- meneekö keskustaan bussia
 
 -- modifiers of places
 
diff --git a/examples/phrasebook/WordsFre.gf b/examples/phrasebook/WordsFre.gf
index 14a87f1e6..dd4508552 100644
--- a/examples/phrasebook/WordsFre.gf
+++ b/examples/phrasebook/WordsFre.gf
@@ -124,8 +124,9 @@ lin
 -- Building phrases from strings is complicated: the solution is to use
 -- mkText : Text -> Text -> Text ;
 
-    PSeeYou d = mkText (lin Text (ss ("on se verra"))) (mkPhrase (mkUtt d)) ;
-    PSeeYouPlace p d = 
+    PSeeYouPlace p = mkText (lin Text (ss ("on se verra"))) (mkPhrase (mkUtt p.at)) ;
+    PSeeYouDate d = mkText (lin Text (ss ("on se verra"))) (mkPhrase (mkUtt d)) ;
+    PSeeYouPlaceDate p d = 
       mkText (lin Text (ss ("on se verra"))) 
         (mkText (mkPhrase (mkUtt p.at)) (mkPhrase (mkUtt d))) ;
 
diff --git a/examples/phrasebook/WordsGer.gf b/examples/phrasebook/WordsGer.gf
index 1b41fdb69..c41524ba5 100644
--- a/examples/phrasebook/WordsGer.gf
+++ b/examples/phrasebook/WordsGer.gf
@@ -110,8 +110,8 @@ concrete WordsGer of Words = SentencesGer **
 -- Building phrases from strings is complicated: the solution is to use
 -- mkText : Text -> Text -> Text ;
 
---    PSeeYou d = mkText (lin Text (ss ("auf Wiedersehen"))) (mkPhrase (mkUtt d)) ;
---    PSeeYouPlace p d = 
+--    PSeeYouDate d = mkText (lin Text (ss ("auf Wiedersehen"))) (mkPhrase (mkUtt d)) ;
+--    PSeeYouPlaceDate p d = 
 --      mkText (lin Text (ss ("auf Wiedersehen"))) 
 --        (mkText (mkPhrase (mkUtt p.at)) (mkPhrase (mkUtt d))) ;
 
diff --git a/examples/phrasebook/WordsIta.gf b/examples/phrasebook/WordsIta.gf
index dae4b0288..d64611a10 100644
--- a/examples/phrasebook/WordsIta.gf
+++ b/examples/phrasebook/WordsIta.gf
@@ -124,8 +124,9 @@ lin
 -- Building phrases from strings is complicated: the solution is to use
 -- mkText : Text -> Text -> Text ;
 
-    PSeeYou d = mkText (lin Text (ss ("ci vediamo"))) (mkPhrase (mkUtt d)) ;
-    PSeeYouPlace p d = 
+    PSeeYouDate d = mkText (lin Text (ss ("ci vediamo"))) (mkPhrase (mkUtt d)) ;
+    PSeeYouPlace p = mkText (lin Text (ss ("ci vediamo"))) (mkPhrase (mkUtt p.at)) ;
+    PSeeYouPlaceDate p d = 
       mkText (lin Text (ss ("ci vediamo"))) 
         (mkText (mkPhrase (mkUtt p.at)) (mkPhrase (mkUtt d))) ;
 
diff --git a/examples/phrasebook/WordsRon.gf b/examples/phrasebook/WordsRon.gf
index f6fa48a0e..704c66b6b 100644
--- a/examples/phrasebook/WordsRon.gf
+++ b/examples/phrasebook/WordsRon.gf
@@ -123,7 +123,7 @@ concrete WordsRon of Words = SentencesRon ** open
     HowFarFrom x y = mkQS (mkQCl how8much_IAdv (mkNP (mkDestination y.name) (SyntaxRon.mkAdv from_Prep x.name))) ;
     HowFarFromBy x y t = 
       mkQS (mkQCl how8much_IAdv (mkNP (mkNP (mkDestination y.name) (SyntaxRon.mkAdv from_Prep x.name)) t)) ;
-    HowFarBy y t = mkQS (mkQCl how8much_IAdv (mkNP (mkDestination y.name) t.by)) ; 
+    HowFarBy y t = mkQS (mkQCl how8much_IAdv (mkNP (mkDestination y.name) t)) ; 
 
    WhichTranspPlace trans place = 
       mkQS (mkQCl (mkIP which_IDet trans.name) (mkVP (mkVP L.go_V) place.to)) ;
@@ -176,10 +176,11 @@ concrete WordsRon of Words = SentencesRon ** open
 -- Building phrases from strings is complicated: the solution is to use
 -- mkText : Text -> Text -> Text ;
 
-    PSeeYou d = mkText (lin Text {s = ("ne" ++ "vedem")}) (mkPhrase (mkUtt d)) ;
-    PSeeYouPlace p d = 
+    PSeeYouDate d = mkText (lin Text {s = ("ne" ++ "vedem")}) (mkPhrase (mkUtt d)) ;
+    PSeeYouPlaceDate p d = 
       mkText (lin Text { s = ("ne" ++ "vedem")}) 
         (mkText (mkPhrase (mkUtt p.at)) (mkPhrase (mkUtt d))) ;
+    PSeeYouPlace p = mkText (lin Text {s = ("ne" ++ "vedem")}) (mkPhrase (mkUtt p.at)) ;
 
 -- Relations are expressed as "my wife" or "the wife of my son", as defined by $xOf$
 -- below. Languages with productive genitives can use an equivalent of
diff --git a/examples/phrasebook/WordsSwe.gf b/examples/phrasebook/WordsSwe.gf
index edaede731..27b6ee7cb 100644
--- a/examples/phrasebook/WordsSwe.gf
+++ b/examples/phrasebook/WordsSwe.gf
@@ -159,8 +159,9 @@ concrete WordsSwe of Words = SentencesSwe **
 -- Building phrases from strings is complicated: the solution is to use
 -- mkText : Text -> Text -> Text ;
 
-    PSeeYou d = mkText (lin Text (ss ("vi ses"))) (mkPhrase (mkUtt d)) ;
-    PSeeYouPlace p d = 
+    PSeeYouDate d = mkText (lin Text (ss ("vi ses"))) (mkPhrase (mkUtt d)) ;
+    PSeeYouPlace p = mkText (lin Text (ss ("vi ses"))) (mkPhrase (mkUtt p.at)) ;
+    PSeeYouPlaceDate p d = 
       mkText (lin Text (ss ("vi ses"))) 
         (mkText (mkPhrase (mkUtt p.at)) (mkPhrase (mkUtt d))) ;