From 463773d9296d037106c436491d1fa95e6fcc954b Mon Sep 17 00:00:00 2001
From: aarne <unknown>
Date: Wed, 14 Sep 2005 07:19:38 +0000
Subject: [PATCH] Slash in Fin

---
 lib/resource/finnish/CategoriesFin.gf |  2 +-
 lib/resource/finnish/RulesFin.gf      |  2 +-
 lib/resource/finnish/SyntaxFin.gf     | 26 ++++++++++++++------------
 3 files changed, 16 insertions(+), 14 deletions(-)

diff --git a/lib/resource/finnish/CategoriesFin.gf b/lib/resource/finnish/CategoriesFin.gf
index d6252d39d..3558249a9 100644
--- a/lib/resource/finnish/CategoriesFin.gf
+++ b/lib/resource/finnish/CategoriesFin.gf
@@ -80,7 +80,7 @@ lincat
   Cl     = Clause ;
       -- = {s : SType => Bool => SForm => Str} ;
 
-  Slash  = Sentence ** {s2 : Str ; c : Case} ;
+  Slash  = QuestClause ** {s2 : Str ; c : ComplCase} ;
 
   RP     = {s : Number => Case => Str} ;
   RCl    = {s : Bool   => SForm => Number => Str} ;
diff --git a/lib/resource/finnish/RulesFin.gf b/lib/resource/finnish/RulesFin.gf
index 2b25121d2..4477a5ca4 100644
--- a/lib/resource/finnish/RulesFin.gf
+++ b/lib/resource/finnish/RulesFin.gf
@@ -125,7 +125,7 @@ lin
 --3 Sentences and relative clauses
 --
 
-----  SlashV2 = slashTransVerbCl ;
+  SlashV2 = slashTransVerbCl ;
 ----  SlashVV2 = slashVerbVerb ;
 ----  SlashAdv cl p = slashAdverb cl p.s ;
 
diff --git a/lib/resource/finnish/SyntaxFin.gf b/lib/resource/finnish/SyntaxFin.gf
index 0b732fedd..3a7d19c35 100644
--- a/lib/resource/finnish/SyntaxFin.gf
+++ b/lib/resource/finnish/SyntaxFin.gf
@@ -1150,18 +1150,20 @@ oper
 -- neutralizes: even prepositions are attached after relative and interrogative
 -- pronouns: "jota ennen" cf. "ennen talvea". Otherwise, the category and
 -- the rules are very similar to transitive verbs. Notice that the case gets
--- fixed by the Boolean parameter and the subject.
+-- fixed by the Boolean parameter and the subject, when the slash is
+-- used: "talo jonka ostin - talo jota en ostanut" ; 
+-- "talo joka minulla on - talo jota minulla ei ole".
 
-  SentenceSlashNounPhrase = Sentence ** {s2 : Str ; c : Case} ;
-{-
-  slashTransVerb : Bool -> NounPhrase -> TransVerb -> SentenceSlashNounPhrase = 
-    \b,jussi,ostaa ->
-    predVerbPhrase jussi (predVerbGroup b (predVerb ostaa)) ** {
-      s2 = ostaa.s3 ++ ostaa.s4 ;
-      c  = npForm2Case jussi.n 
-                       (complementCase b ostaa.c (Pres jussi.n (np2Person jussi.p)))
+
+  SentenceSlashNounPhrase = QuestClause ** {s2 : Str ; c : ComplCase} ;
+
+  slashTransVerbCl : NounPhrase -> TransVerb -> SentenceSlashNounPhrase = 
+    \jussi,ostaa -> {
+      s  = \\p => (sats2clause (mkSats jussi ostaa)).s ! <SDecl,p.p1,p.p2> ; 
+      s2 = ostaa.s3 ;
+      c  = ostaa.c
       } ;
--}
+
 
 
 --2 Relative pronouns and relative clauses
@@ -1305,8 +1307,8 @@ oper
 --  intVerbPhrase : IntPron -> VerbPhrase -> Question = \kuka,ui ->
 --    predVerbPhrase (kuka ** {p = NP3}) ui ;
 
-  intSlash : IntPron -> SentenceSlashNounPhrase -> Question = \kuka,tapaat ->
-    ss (kuka.s ! NPCase tapaat.c ++ tapaat.s2 ++ tapaat.s) ;
+--  intSlash : IntPron -> SentenceSlashNounPhrase -> QuestClause = \kuka,tapaat ->
+--    ss (kuka.s ! NPCase tapaat.c ++ tapaat.s2 ++ tapaat.s) ;
 
 
 --3 Interrogative adverbials