From 787714b3fe2332f8ebbb892d45ec66842cedd11b Mon Sep 17 00:00:00 2001
From: aarne <aarne@chalmers.se>
Date: Thu, 17 Dec 2009 08:49:41 +0000
Subject: [PATCH] postfix subjunction SSubjS, defined for Eng, Ger, Romance

---
 lib/src/abstract/Sentence.gf       | 4 ++++
 lib/src/english/SentenceEng.gf     | 2 ++
 lib/src/german/SentenceGer.gf      | 2 ++
 lib/src/romance/SentenceRomance.gf | 2 ++
 4 files changed, 10 insertions(+)

diff --git a/lib/src/abstract/Sentence.gf b/lib/src/abstract/Sentence.gf
index 903567ea1..bda7b7302 100644
--- a/lib/src/abstract/Sentence.gf
+++ b/lib/src/abstract/Sentence.gf
@@ -66,6 +66,10 @@ abstract Sentence = Cat ** {
 
     AdvS     : Adv -> S  -> S ;            -- today, I will go home
 
+-- This covers subjunctive clauses, but they can also be added to the end.
+
+    SSubjS   : S -> Subj -> S -> S ;       -- I go home if she comes
+
 -- A sentence can be modified by a relative clause referring to its contents.
 
     RelS     : S -> RS -> S ;              -- she sleeps, which is good
diff --git a/lib/src/english/SentenceEng.gf b/lib/src/english/SentenceEng.gf
index 4ab0dcc87..c1679bdbc 100644
--- a/lib/src/english/SentenceEng.gf
+++ b/lib/src/english/SentenceEng.gf
@@ -58,6 +58,8 @@ concrete SentenceEng of Sentence = CatEng ** open Prelude, ResEng in {
 
     AdvS a s = {s = a.s ++ "," ++ s.s} ;
 
+    SSubjS a s b = {s = a.s ++ "," ++ s.s ++ b.s} ;
+
     RelS s r = {s = s.s ++ "," ++ r.s ! agrP3 Sg} ;
 
   oper
diff --git a/lib/src/german/SentenceGer.gf b/lib/src/german/SentenceGer.gf
index 6b88a1b3f..514096fdc 100644
--- a/lib/src/german/SentenceGer.gf
+++ b/lib/src/german/SentenceGer.gf
@@ -62,6 +62,8 @@ concrete SentenceGer of Sentence = CatGer ** open ResGer, Prelude in {
 
     AdvS a s = {s = \\o => a.s ++ s.s ! Inv} ;
 
+    SSubjS a s b = {s = \\o => a.s ! o ++ "," ++ s.s ++ b.s ! Sub} ;
+
     RelS s r = {s = \\o => s.s ! o ++ "," ++ r.s ! gennum Neutr Sg} ; --- "welches"
 
 }
diff --git a/lib/src/romance/SentenceRomance.gf b/lib/src/romance/SentenceRomance.gf
index 69d68088e..00958e4f4 100644
--- a/lib/src/romance/SentenceRomance.gf
+++ b/lib/src/romance/SentenceRomance.gf
@@ -69,6 +69,8 @@ incomplete concrete SentenceRomance of Sentence =
 
     AdvS a s = {s = \\o => a.s ++ "," ++ s.s ! o} ;
 
+    SSubjS a s b = {s = \\m => a.s ! m ++ "," ++ s.s ++ b.s ! s.m} ;
+
     RelS s r = {
       s = \\o => s.s ! o ++ "," ++ partQIndir ++ r.s ! Indic ! agrP3 Masc Sg
       } ;