Sentence adverbials.

6 files changed, 50 insertions, 20 deletions

diff --git a/grammars/resource/abstract/ResAbs.gf b/grammars/resource/abstract/ResAbs.gf
index f31cf59a9..7bb4d8816 100644
--- a/grammars/resource/abstract/ResAbs.gf
+++ b/grammars/resource/abstract/ResAbs.gf
@@ -229,6 +229,7 @@ fun
   SubjS     : Subj -> S -> S -> S ;        -- "if 2 is odd, 3 is even"
   SubjImper : Subj -> S -> Imp -> Imp ;    -- "if it is hot, use a glove!"
   SubjQu    : Subj -> S -> Qu -> Qu ;      -- "if you are new, who are you?"
+  SubjVP    : VP -> Subj -> S -> VP ;      -- "(a man who) sings when he runs"
 
 --2 One-word utterances
 --
diff --git a/grammars/resource/english/ResEng.gf b/grammars/resource/english/ResEng.gf
index fc02ea4b1..d302034d4 100644
--- a/grammars/resource/english/ResEng.gf
+++ b/grammars/resource/english/ResEng.gf
@@ -170,6 +170,7 @@ lin
   SubjS = subjunctSentence ;
   SubjImper = subjunctImperative ;
   SubjQu = subjunctQuestion ;
+  SubjVP = subjunctVerbPhrase ;
 
   PhrNP = useNounPhrase ;
   PhrOneCN = useCommonNounPhrase singular ;
diff --git a/grammars/resource/english/Syntax.gf b/grammars/resource/english/Syntax.gf
index 09969a28c..18944fa2d 100644
--- a/grammars/resource/english/Syntax.gf
+++ b/grammars/resource/english/Syntax.gf
@@ -889,6 +889,9 @@ oper
   subjunctVariants : Subjunction -> Str -> Str -> Str = \if,A,B ->
     variants {if.s ++ A ++ "," ++ B ; B ++ "," ++ if.s ++ A} ;
 
+  subjunctVerbPhrase : VerbPhrase -> Subjunction -> Sentence -> VerbPhrase =
+    \V, if, A -> 
+    adVerbPhrase V (advPost (if.s ++ A.s)) ;
 
 --2 One-word utterances
 -- 
diff --git a/grammars/resource/german/Paradigms.gf b/grammars/resource/german/Paradigms.gf
index 0562b544d..d180dc281 100644
--- a/grammars/resource/german/Paradigms.gf
+++ b/grammars/resource/german/Paradigms.gf
@@ -285,7 +285,7 @@ oper
   apReg = \s -> AdjP1 (adjGen s) ;
 
   mkV = \sehen, sieht, sieh, gesehen -> 
-    mkVerbSimple (mkVerbum sehen sieht sieh gesehen) ;
+    mkVerbSimple (mkVerbum sehen (Predef.tk 1 sieht) sieh gesehen) ;
   vReg = \s -> mkVerbSimple (regVerb s) ;
   vSein = verbSein ;
   vHaben = verbHaben ;
diff --git a/grammars/resource/german/ResDeu.gf b/grammars/resource/german/ResDeu.gf
index 871240cfb..8a602e305 100644
--- a/grammars/resource/german/ResDeu.gf
+++ b/grammars/resource/german/ResDeu.gf
@@ -45,7 +45,7 @@ lincat
 
   V      = Verb ; 
       -- = {s : VForm => Str ; s2 : Particle} ;
-  VP     = Verb ** {s3 : Number => Str} ;
+  VP     = Verb ** {s3 : Number => Str ; s4 : Str} ;
   TV     = TransVerb ; 
       -- = Verb ** {s3 : Preposition ; c : Case} ;
   V3     = TransVerb ** {s4 : Preposition ; c2 : Case} ;
@@ -173,6 +173,7 @@ lin
   SubjS = subjunctSentence ;
   SubjImper = subjunctImperative ;
   SubjQu = subjunctQuestion ;
+  SubjVP = subjunctVerbPhrase ;
 
   PhrNP = useNounPhrase ;
   PhrOneCN = useCommonNounPhrase singular ;
diff --git a/grammars/resource/german/Syntax.gf b/grammars/resource/german/Syntax.gf
index 1d0a21e5f..afaf1ad86 100644
--- a/grammars/resource/german/Syntax.gf
+++ b/grammars/resource/german/Syntax.gf
@@ -341,11 +341,12 @@ oper
 --3 Verb phrases
 --
 -- Verb phrases are discontinuous: the parts of a verb phrase are
--- (s) an inflected verb, (s2) particle, and 
--- (s3) negation and complement. This discontinuity is needed in sentence formation
+-- (s) an inflected verb, (s2) particle,  
+-- (s3) negation and complement, and (s4) sentential adverbial. 
+-- This discontinuity is needed in sentence formation
 -- to account for word order variations.
 
-  VerbPhrase = Verb ** {s3 : Number => Str} ; 
+  VerbPhrase = Verb ** {s3 : Number => Str ; s4 : Str} ; 
 
 -- A simple verb can be made into a verb phrase with an empty complement.
 -- There are two versions, depending on if we want to negate the verb.
@@ -354,7 +355,8 @@ oper
 
   predVerb : Bool -> Verb -> VerbPhrase = \b,aussehen -> 
     aussehen ** {
-     s3 = \\_ => negation b
+     s3 = \\_ => negation b ;
+     s4 = []
      } ;
 
   negation : Bool -> Str = \b -> if_then_else Str b [] "nicht" ;
@@ -370,17 +372,20 @@ oper
 
   predAdjective : Bool -> Adjective -> VerbPhrase = \b,gut ->
     verbSein ** {
-      s3 = \\_ => negation b ++ gut.s ! APred
+      s3 = \\_ => negation b ++ gut.s ! APred ;
+      s4 = []
       } ;
 
   predCommNoun : Bool -> CommNounPhrase -> VerbPhrase = \b,man ->
     verbSein ** {
-      s3 = \\n => negation b ++ indefNoun n man
+      s3 = \\n => negation b ++ indefNoun n man ;
+      s4 = []
      } ;
 
   predNounPhrase : Bool -> NounPhrase -> VerbPhrase = \b,dermann ->
     verbSein ** {
-      s3 = \\n => negation b ++ dermann.s ! NPCase Nom
+      s3 = \\n => negation b ++ dermann.s ! NPCase Nom ;
+      s4 = []
      } ;
 
 --3 Transitive verbs
@@ -407,7 +412,8 @@ oper
       } in
     {s  = warten.s ; 
      s2 = warten.s2 ; 
-     s3 = \\_ => bothWays aufdich nicht
+     s3 = \\_ => bothWays aufdich nicht ;
+     s4 = []
     } ;
 
 -- Transitive verbs with accusative objects can be used passively. 
@@ -417,7 +423,8 @@ oper
   passVerb : Bool -> Verb -> VerbPhrase = \b,lieben ->
     {s  = verbumWerden ; 
      s2 = [] ; 
-     s3 = \\_ => negation b ++ lieben.s ! VPart APred
+     s3 = \\_ => negation b ++ lieben.s ! VPart APred ;
+     s4 = []
     } ;
 
 -- Transitive verb can be used elliptically as a verb. The semantics
@@ -451,7 +458,8 @@ oper
        nicht ++ zudir ++ dasbier ;
        zudir ++ nicht ++ dasbier ;
        zudir ++ dasbier ++ nicht
-       }
+       } ;
+     s4 = []
     } ;
   
 
@@ -467,7 +475,8 @@ oper
   adVerbPhrase : VerbPhrase -> Adverb -> VerbPhrase = \spielt, gut ->
     {s  = spielt.s ; 
      s2 = spielt.s2 ;
-     s3 = \\n => spielt.s3 ! n ++ gut.s 
+     s3 = \\n => spielt.s3 ! n ++ gut.s ;
+     s4 = spielt.s4
     } ;
 
   advAdjPhrase : Adverb -> AdjPhrase -> AdjPhrase = \sehr, gut ->
@@ -511,12 +520,13 @@ oper
       ich   = Ich.s ! NPCase Nom ; 
       liebe = LiebeDichNichtAus.s ! VInd Ich.n Ich.p ;
       aus   = LiebeDichNichtAus.s2 ;
-      dichnichtgut = LiebeDichNichtAus.s3 ! Ich.n
+      dichnichtgut = LiebeDichNichtAus.s3 ! Ich.n ;
+      wennesregnet = LiebeDichNichtAus.s4
     } in
     {s = table {
-       Main => ich ++ liebe ++ dichnichtgut ++ aus ;
-       Inv  => liebe ++ ich ++ dichnichtgut ++ aus ;
-       Sub  => ich ++ dichnichtgut ++ aus ++ liebe
+       Main => ich ++ liebe ++ dichnichtgut ++ aus ++ wennesregnet ;
+       Inv  => liebe ++ ich ++ dichnichtgut ++ aus ++ wennesregnet ;
+       Sub  => ich ++ dichnichtgut ++ aus ++ liebe ++ wennesregnet
        }
     } ;
 
@@ -527,8 +537,10 @@ oper
   SentenceVerb : Type = Verb ;
 
   complSentVerb : Bool -> SentenceVerb -> Sentence -> VerbPhrase = \b,sage,duisst ->
-    sage **
-    {s3 = \\_ => negation b ++ "," ++ "dass" ++ duisst.s ! Sub} ;
+    sage ** {
+      s3 = table Number {_ => negation b} ;
+      s4 = "," ++ "dass" ++ duisst.s ! Sub
+      } ;
 
 
 --2 Sentences missing noun phrases
@@ -746,7 +758,7 @@ oper
   Imperative = SS1 Number ;
 
   imperVerbPhrase : VerbPhrase -> Imperative = \komm -> 
-    {s = \\n => komm.s ! VImp n ++ komm.s3 ! n ++ komm.s2} ;  
+    {s = \\n => komm.s ! VImp n ++ komm.s3 ! n ++ komm.s2 ++ komm.s4} ;  
 
   imperUtterance : Number -> Imperative -> Utterance = \n,I ->
     ss (I.s ! n ++ "!") ;
@@ -909,6 +921,18 @@ oper
     let {As = A.s ! Sub} in 
     variants {if.s ++ As ++ "," ++ B ; B ++ "," ++ if.s ++ As} ;
 
+-- Subjunctions can be used for building adverbials, which can modify verb phrases
+-- ("ich lache wenn ich gehe und singe wenn ich laufe"). , noun phrases, etc.
+-- For reasons of word order, we treat this separately from other adverbials,
+-- but this could be remedied by an extra parameter in adverbials.
+
+  subjunctVerbPhrase : VerbPhrase -> Subjunction -> Sentence -> VerbPhrase = 
+    \ruft,wenn,ergeht ->
+    {s  = ruft.s ; 
+     s2 = ruft.s2 ;
+     s3 = ruft.s3 ;
+     s4 = ruft.s4 ++ "," ++ wenn.s ++ ergeht.s ! Sub 
+    } ;
 
 --2 One-word utterances
 --