Added more verb forms, see NEW: in MorphoGer.gf.

lib/resource-0.6/german/MorphoGer.gf

@@ -51,11 +51,14 @@ oper
 -- Here are the school grammar declensions with their commonest variations.
 -- Unfortunately we cannot define *Umlaut* in GF, but have to give two forms.
 --
--- First declension, with plural "en"/"n", including weak masculins:
+-- First declension, with plural "en"/"n", including weak masculines:
 
   declN1  : Str -> CommNoun = \zahl  -> 
     mkNoun2n zahl  (zahl + "en") Fem ;
 
+  declN1in : Str -> CommNoun = \studentin -> 
+    mkNoun2n studentin (studentin + "nen") Fem ;
+
   declN1e : Str -> CommNoun = \stufe -> 
     mkNoun2n stufe (stufe + "n") Fem ; 
 
@@ -70,9 +73,15 @@ oper
   declN2  : Str -> CommNoun = \punkt -> 
     mkNoun2es punkt (punkt+"e") Masc ;
 
+  declN2n  : Str -> CommNoun = \bein -> 
+    mkNoun2es bein (bein+"e") Neut ;
+
   declN2i  : Str -> CommNoun = \onkel -> 
     mkNoun2s onkel onkel Masc ;
 
+  declN2in  : Str -> CommNoun = \segel -> 
+    mkNoun2s segel segel Neut ;
+
   declN2u : (_,_ : Str) -> CommNoun = \raum,räume -> 
     mkNoun2es raum räume Masc ;
 
@@ -105,9 +114,9 @@ oper
   ProPN = {s : NPForm => Str ; n : Number ; p : Person} ;
 
   mkPronPers : (_,_,_,_,_ : Str) -> Number -> Person -> ProPN = 
-    \ich,mich,mir,meines,mein,n,p -> {
+    \ich,mich,mir,meiner,mein,n,p -> {
       s = table {
-        NPCase c    => caselist ich mich mir meines ! c ;
+        NPCase c    => caselist ich mich mir meiner ! c ;
         NPPoss gn c => mein + pronEnding ! gn ! c
         } ;
       n = n ;
@@ -121,11 +130,11 @@ oper
     GPl      => caselist "e"  "e" "en" "er"
     } ;
 
-  pronIch  = mkPronPers "ich" "mich" "mir"   "meines" "mein"  Sg P1 ;
+  pronIch  = mkPronPers "ich" "mich" "mir"   "meiner" "mein"  Sg P1 ;
-  pronDu   = mkPronPers "du"  "dich" "dir"   "deines" "dein"  Sg P2 ;
+  pronDu   = mkPronPers "du"  "dich" "dir"   "deiner" "dein"  Sg P2 ;
-  pronEr   = mkPronPers "er"  "ihn"  "ihm"   "seines" "sein"  Sg P3 ;
+  pronEr   = mkPronPers "er"  "ihn"  "ihm"   "seiner" "sein"  Sg P3 ;
-  pronSie  = mkPronPers "sie" "sie"  "ihr"   "ihres"  "ihr"   Sg P3 ;
+  pronSie  = mkPronPers "sie" "sie"  "ihr"   "ihrer"  "ihr"   Sg P3 ;
-  pronEs   = mkPronPers "es"  "es"   "ihm"   "seines" "sein"  Sg P3 ;
+  pronEs   = mkPronPers "es"  "es"   "ihm"   "seiner" "sein"  Sg P3 ;
   pronWir  = mkPronPers "wir" "uns"  "uns"   "unser"  "unser" Pl P1 ;
 
   pronSiePl = mkPronPers "sie" "sie"  "ihnen" "ihrer"  "ihr"   Pl P3 ;
@@ -265,6 +274,7 @@ oper
     adjCompReg3 billig (billig+"er") (billig+"st") ;
 
 
+--OLD:
 --2 Verbs
 --
 -- We limit ourselves to verbs in present tense infinitive, indicative, 
@@ -274,55 +284,188 @@ oper
 -- singular indicative, and the second person singular imperative. 
 -- We take care of the special cases "ten", "sen", "ln", "rn".
 --
--- A famous law about Germanic languages says that plural first and third person
+-- A famous law about Germanic languages says that plural first and third 
--- are similar.
+-- person are similar.
 
-  mkVerbum : (_,_,_,_ : Str) -> Verbum = \geben, gib, gb, gegeben -> 
+--NEW (By Harald Hammarström):
+--2 Verbs
+-- The worst-case macro needs six forms:
+-- x Infinitive, 
+-- x 3p sg pres. indicative, 
+-- x 2p sg imperative, 
+-- x 1/3p sg imperfect indicative, 
+-- x 1/3p sg imperfect subjunctive (because this uncommon form can have umlaut)
+-- x the perfect participle 
+
+-- But you'll only want to use one of the five macros:
+-- x weakVerb              -- For a regular verb like legen
+-- x verbGratulieren       -- For a regular verb without ge- in the perfect
+--                            particple. Like gratulieren, beweisen etc 
+-- x verbStrongSingen      -- A strong verb without umlauting present tense.
+--                            You'll need to supply the strong imperfect forms
+--                            as well as the participle. 
+-- x verbStrongSehen       -- A strong verb that umlauts in the 2/3p sg pres
+--                            indicative as well as the imperative. You'll
+--                            need to give (only) the 3rd p sg pres ind. in
+--                            addition to the strong imperfect forms and the
+--                            part participle.
+-- x verbStrongLaufen      -- A strong verb that umlauts in the 2/3p sg pres
+--                            indicative but NOT the imperative. You'll
+--                            need to give (only) the 3rd p sg pres ind. in
+--                            addition to the strong imperfect forms and the
+--                            part participle.
+--
+-- Things that are handled automatically
+-- x Imperative e (although optional forms are not given)
+-- x Extra e in verbs like arbeitete, regnet, findet, atmet.
+--   NOTE: If pres. umlauting strong verbs are defined through the verbumStrong
+--   macro (which they should) it is automatically handled so they avoid 
+--   falling into this rule e.g er tritt (rather than *er tritet)
+-- x s is dropped in the 2p sg if appropriate du setzt
+-- x verbs that end in -rn, -ln rather than -en
+
+-- Things that are not handled:
+-- x -ß-/-ss-
+-- x Optional dropping of -e- in e.g wand(e)re etc
+-- x Optional indicative forms instead of pres. subj. 2p sg. and 2p pl.  
+-- x (Weak) verbs without the ge- on the participle (in wait for a systematic
+--   treatment of the insep. prefixes and stress). You have to manually use
+--   the verbGratulieren for this. E.g do verbGratulieren "beweisen" - 
+--   verbWeak "beweisen" would yield *gebeweist.
+
+  impe : Str -> Str = \stem ->  
+  let
+    e = ifTok Str (Predef.dp 2 stem) "ig" "e" [] ;
+    e2 = (adde stem)
+  in  
+    e + e2 ;
+ 
+  adde : Str -> Str = \stem ->
+  let
+    eVowelorLiquid : Str -> Str = \u -> case u of {
+      "l" => "e" ; 
+      "r" => "e" ;
+      "a" => "e" ;
+      "o" => "e" ;
+      "u" => "e" ;
+      "e" => "e" ;
+      "i" => "e" ;
+      "ü" => "e" ;
+      "ä" => "e" ;
+      "ö" => "e" ;
+      _   => [] 
+    } ;   
+
+    eConsonantmn : Str -> Str -> Str = \nl, l -> 
+      case l of {"m" => eVowelorLiquid nl ;
+                 "n" => eVowelorLiquid nl ;
+                 _ => []} ;
+ 
+
+    twolast = Predef.dp 2 stem ;
+    nl = Predef.tk 1 twolast ;
+    l = Predef.tk 1 stem ;
+    e = case l of {
+          "d" => "e" ;
+          "t" => "e" ;
+          _ => eConsonantmn nl l
+        } ;
+  in 
+    e ;
+
+
+  mkVerbum : (_,_,_,_,_,_ : Str) -> Verbum = \geben,gibt,gib,gab,gäbe,gegeben -> 
     let {
+       ifSibilant : Str -> Str -> Str -> Str = \u,b1,b2 -> case u of {
+         "s" => b1 ;
+         "x" => b1 ;
+         "z" => b1 ;
+         "ß" => b1 ;
+         _   => b2 
+       } ; 
        en = Predef.dp 2 geben ;
        geb = ifTok Tok (Predef.tk 1 en) "e" (Predef.tk 2 geben)(Predef.tk 1 geben) ;
-       gebt = ifTok Tok (Predef.dp 1 geb) "t" (geb + "et") (geb + "t") ;
+       gebt = (adde geb) + "t" ;
-       gibst = ifTok Tok (Predef.dp 1 gib) "s" (gib + "t") (gib + "st") ;
+       gebte = ifTok Tok (Predef.dp 1 gab) "e" gab (gab + "e") ;
-       gegebener = (adjReg gegeben).s
+       gibst = ifSibilant (Predef.dp 1 gib) (gib + "t") (gib + "st") ;
+       gegebener = (adjReg gegeben).s ;
     } in table {
-           VInf       => geben ;
+       VInf       => geben ;
-           VInd Sg P1 => geb + "e" ;
+       VInd Sg P1 => geb + "e" ;
-           VInd Sg P2 => gibst ;
+       VInd Sg P2 => gibst ;
-           VInd Sg P3 => gib + "t" ;
+       VInd Sg P3 => gibt ;
-           VInd Pl P2 => gebt ;
+       VInd Pl P2 => gebt ;
-           VInd Pl _  => geben ; -- the famous law
+       VInd Pl _  => geben ; -- the famous law
-           VImp Sg    => gb ;
+       VImp Sg    => (impe gib) ;
-           VImp Pl    => gebt ;
+       VImp Pl    => gebt ;
-           VPart a    => gegebener ! a
+       VSubj Sg P1 => geb + "e" ;
-           } ;
+       VSubj Sg P2 => geb + "est" ;
+       VSubj Sg P3 => geb + "e" ;
+       VSubj Pl P2 => geb + "et" ;
+       VSubj Pl _  => geben ;
+       VPresPart a => (adjReg (geben + "d")).s ! a ;
 
--- Regular verbs:
+       VImpfInd Sg P1 => gab ;
+       VImpfInd Sg P2 => (adde gab) + "st" ;
+       VImpfInd Sg P3 => gab ;
+       VImpfInd Pl P2 => gebte + "n" ;
+       VImpfInd Pl _  => gab + "t" ;
 
-  regVerb : Str -> Verbum = \legen ->
+       VImpfSubj Sg P1 => gäbe ;
-    let {lege = ifTok Tok (Predef.dp 3 legen) "ten" (Predef.tk 1 legen) (
+       VImpfSubj Sg P2 => gäbe + "st" ;
-                ifTok Tok (Predef.dp 2 legen) "en"  (Predef.tk 2 legen) (
+       VImpfSubj Sg P3 => gäbe ;
-                                                     Predef.tk 1 legen))} in
+       VImpfSubj Pl P2 => gäbe + "n" ;
-    mkVerbum legen lege lege ("ge" + (lege + "t")) ;
+       VImpfSubj Pl _  => gäbe + "t" ;
 
--- Verbs ending with "t"; now recognized in $mkVerbum$.
+       VPart a    => gegebener ! a
+       } ;
  
-  verbWarten : Str -> Verbum = regVerb ;
+-- Weak verbs:
+  verbumWeak : Str -> Verbum = \legen ->
+    let 
+       leg = (Predef.dp 2 legen) ;
+       legte = leg + "te" ;
+    in
+       mkVerbum legen ((adde leg) + "t") leg legte legte ("ge" + (leg + "t")) ;
 
--- Verbs with Umlaut in the second and third person singular and imperative:
 
-  verbSehen : Str -> Str -> Str -> Verbum = \sehen, sieht, gesehen -> 
+-- Weak verbs that don't have ge- in the participle
-    let {sieh = Predef.tk 1 sieht} in mkVerbum sehen sieh sieh gesehen ;
+  verbumGratulieren : Str -> Verbum = \gratulieren ->
+    let 
+       gratulier = (Predef.dp 2 gratulieren) ;
+       gratulierte = gratulier + "te" ;
+    in
+       mkVerbum gratulieren ((adde gratulier) + "t") gratulier gratulierte gratulierte (gratulier + "t") ;
 
--- Verbs with Umlaut in the second and third person singular but not imperative:
 
-  verbLaufen : Str -> Str -> Str -> Verbum = \laufen, läuft, gelaufen -> 
+
-    let {läuf = Predef.tk 1 läuft ; laufe = Predef.tk 1 laufen} 
+-- Strong verbs (non-present-tense umlauting):
-    in mkVerbum laufen läuf laufe gelaufen ;
+  verbumStrongSingen : (_,_,_,_ : Str) -> Verbum = \singen, sang, sänge, gesungen ->
+    let 
+       sing = (Predef.dp 2 singen)
+    in
+       mkVerbum singen ((adde sing) + "t") sing sang sänge gesungen ;
+
+-- Verbs with Umlaut in the 2nd and 3rd person singular and imperative:
+  verbumStrongSehen : (_,_,_,_,_ : Str) -> Verbum = \sehen,sieht,sah,sähe,gesehen -> 
+    let 
+       sieh = Predef.dp 1 sieht ;
+    in 
+       mkVerbum sehen sieht sieh sah sähe gesehen ;
+
+-- Verbs with Umlaut in the 2nd and 3rd person singular but not imperative:
+-- (or any verb where the 3rd p sg pres ind is "special" and the 2p sg pres ind -- uses its stem.)   
+  verbumStrongLaufen : (_,_,_,_,_ : Str) -> Verbum = \laufen,läuft,lief,liefe,gelaufen -> 
+    let  
+       lauf = Predef.dp 2 laufen ;
+    in 
+       mkVerbum laufen läuft lauf lief liefe gelaufen ;
+
 
 -- The verb "be":
 
   verbumSein : Verbum = let {
-    gewesen = (adjReg "gewesen").s
+    sein = verbumStrongSingen "sein" "war" "wäre" "gewesen" ;
   } in
   table {
     VInf       => "sein" ;
@@ -332,29 +475,40 @@ oper
     VInd Pl P2 => "seid" ;
     VInd Pl _  => "sind" ;
     VImp Sg    => "sei" ;
-    VImp Pl    => "seiet" ;
+    VImp Pl    => "seid" ;
-    VPart a    => gewesen ! a
+
+    VSubj Sg P1 => "sei" ;
+    VSubj Sg P2 => (variants {"seiest" ; "seist"}) ;
+    VSubj Sg P3 => "sei" ;
+    VSubj Pl P2 => "seien" ;
+    VSubj Pl _  => "seiet" ;
+    VPresPart a => ((adjReg "seiend").s) ! a ;
+
+    v => sein ! v 
+
     } ;
 
--- auxiliary verbs
+-- Modal auxiliary verbs
-  verbumAux : (_,_,_,_ : Str) -> Verbum = \konnen,kann,kannst,gekonnt -> 
+  verbumAux : (_,_,_,_,_ : Str) -> Verbum = \können,kann,konnte,könnte,gekonnt -> 
-  let gekonn = (adjReg gekonnt).s in
+  let k = (verbumStrongLaufen können kann konnte könnte gekonnt)
+  in 
   table {
-    VInf       => konnen ;
     VInd Sg P1 => kann ;
-    VInd Sg P2 => kannst ;
+    v          => k ! v
-    VInd Sg P3 => kann ;
+  } ;
-    VInd Pl P2 => konnen ;
+
-    VInd Pl _  => konnen ;
+  verbumKönnen = verbumAux "können" "kann" "konnte" "könnte" "gekonnt" ;
-    VImp Sg    => nonExist ;
+  verbumDürfen = verbumAux "dürfen" "darf" "durfte" "dürfte" "gedurft" ;
-    VImp Pl    => nonExist ;
+  verbumMögen = verbumAux "mögen" "mag" "mochte" "möchte" "gemocht" ;
-    VPart a    => gekonn ! a
+  verbumMüssen = verbumAux "müssen" "muss" "musste" "müsste" "gemusst" ;
-    } ;
+  verbumSollen = verbumAux "sollen" "soll" "sollte" "söllte" "gesollt" ;
+  verbumWollen = verbumAux "wollen" "will" "wollte" "wöllte" "gewollt" ;
+  verbumWissen = verbumAux "wissen" "weiss" "wusste" "wüsste" "gewusst" ;
 
 -- The verb "have":
 
-  verbumHaben :  Verbum = let {
+  verbumHaben : Verbum = let {
-    haben = (regVerb "haben")
+    haben = (verbumStrongSingen "haben" "hatte" "hätte" "gehabt")
     } in 
     table {
       VInd Sg P2 => "hast" ;
@@ -364,17 +518,18 @@ oper
 
 -- The verb "become", used as the passive auxiliary:
 
-  verbumWerden :  Verbum = let {
+  verbumWerden : Verbum = let {
-    werden = regVerb "werden" ;
+    werden = (verbumStrongSingen "werden" "wurde" "würde" "geworden") ;
-    geworden = (adjReg "geworden").s
     } in 
     table {
       VInd Sg P2 => "wirst" ;
       VInd Sg P3 => "wird" ;
-      VPart a    => geworden ! a ;
       v          => werden ! v
       } ;
 
+
+
+
 -- A *full verb* ($Verb$) consists of the inflection forms ($Verbum$) and
 -- a *particle* (e.g. "aus-sehen"). Simple verbs are the ones that have no 
 -- such particle.
@@ -386,7 +541,10 @@ oper
   verbSein = mkVerbSimple verbumSein ;
   verbHaben = mkVerbSimple verbumHaben ;
   verbWerden = mkVerbSimple verbumWerden ;
-  verbGeben = mkVerbSimple (verbSehen "geben" "gibt" "gegeben") ;
+
+-- Apparently needed for "es gibt" etc
+  verbGeben = mkVerbSimple (verbumStrongSehen "geben" "gibt" "gab" "gäbe" "gegeben") ; 
+
 
 {-
   -- tests for optimizer
@@ -399,11 +557,11 @@ oper
     VInd Pl P2 => "seid" ;
     VInd Pl _  => "sind" ;
     VImp Sg    => "sei" ;
-    VImp Pl    => "seiet" ;
+    VImp Pl    => "seid" ;
     VPart a    => (adjReg "gewesen").s ! a
     } ;
 
-  verbumHaben2 :  Verbum = 
+  verbumHaben2 : Verbum = 
     table {
       VInd Sg P2 => "hast" ;
       VInd Sg P3 => "hat" ;

lib/resource-0.6/german/StructuralGer.gf

@@ -92,13 +92,13 @@ lin
 
 
   CanVV     = 
-    mkVerbSimple (verbumAux "können" "kann" "kannst" "gekonnt") ** {isAux = True} ;
+    mkVerbSimple (verbumKönnen) ** {isAux = True} ;
   CanKnowVV = 
-    mkVerbSimple (verbumAux "können" "kann" "kannst" "gekonnt") ** {isAux = True} ;
+    mkVerbSimple (verbumKönnen) ** {isAux = True} ;
   MustVV    = 
-    mkVerbSimple (verbumAux "müssen" "muss" "musst" "gemusst")  ** {isAux = True} ;
+    mkVerbSimple (verbumMüssen) ** {isAux = True} ;
   WantVV    = 
-    mkVerbSimple (verbumAux "wollen" "will" "willst" "gewollt") ** {isAux = True} ;
+    mkVerbSimple (verbumWollen) ** {isAux = True} ;
 
 
   EverywhereNP = ss "überall" ;

lib/resource-0.6/german/TestResourceGer.gf

@@ -24,18 +24,18 @@ lin
   House = declN3uS "Haus" "Häuser" ;
   Light = declN3 "Licht" ;
   Bar = declNs "Bar" ;
-  Walk = mkVerbSimple (verbLaufen "gehen" "geht" "gegangen") ;
+  Walk = mkVerbSimple (verbumStrongSingen "gehen" "ging" "ginge" "gegangen") ;
-  Run = mkVerbSimple (verbLaufen "laufen" "läuft" "gelaufen") ; 
+  Run = mkVerbSimple (verbumStrongLaufen "laufen" "läuft" "lief" "liefe" "gelaufen") ; 
-  Say = mkVerbSimple (regVerb "sagen") ;
+  Say = mkVerbSimple (verbumWeak "sagen") ;
-  Prove = mkVerbSimple (regVerb "beweisen") ;
+  Prove = mkVerbSimple (verbumGratulieren "beweisen") ; --without ge
-  Send = mkTransVerb (mkVerbSimple (verbLaufen "senden" "sendet" "gesandt")) [] Acc;
+  Send = mkTransVerb (mkVerbSimple (verbumStrongSingen "senden" "sandte" "sändte" "gesandt")) [] Acc;
-  Drink = transDir (mkVerbSimple (verbLaufen "trinken" "trinkt" "getrunken")) ;
+  Drink = transDir (mkVerbSimple (verbumStrongSingen "trinken" "trank" "tränke" "getrunken")) ;
-  Love = mkTransVerb (mkVerbSimple (regVerb "lieben")) [] Acc ;
+  Love = mkTransVerb (mkVerbSimple (verbumWeak "lieben")) [] Acc ;
-  Wait = mkTransVerb (mkVerbSimple (verbWarten "warten")) "auf" Acc ;
+  Wait = mkTransVerb (mkVerbSimple (verbumWeak "warten")) "auf" Acc ;
   Give = mkDitransVerb 
-           (mkVerbSimple (verbLaufen "geben" "gibt" "gegeben")) [] Dat [] Acc ;
+           (mkVerbSimple (verbumStrongSehen "geben" "gibt" "gab" "gäbe" "gegeben")) [] Dat [] Acc ;
   Prefer = mkDitransVerb 
-           (mkVerb (verbLaufen "ziehen" "zieht" "gezogen") "vor") [] Acc "vor" Dat ;
+           (mkVerb (verbumStrongSingen "ziehen" "zog" "zöge" "gezogen") "vor") [] Acc "vor" Dat ;
   Mother = mkFunC (n2n (declN2uF "Mutter" "Mütter")) "von" Dat ;
   Uncle = mkFunC (n2n (declN2i "Onkel")) "von" Dat ;
   Connection = mkFunC (n2n (declN1 "Verbindung")) "von" Dat ** 
@@ -44,8 +44,8 @@ lin
   Always = mkAdverb "immer" ;
   Well = mkAdverb "gut" ;
 
-  SwitchOn  = mkTransVerb (mkVerb (verbWarten "schalten") "auf") [] Acc  ;
+  SwitchOn  = mkTransVerb (mkVerb (verbumWeak "schalten") "auf") [] Acc  ;
-  SwitchOff = mkTransVerb (mkVerb (verbWarten "schalten") "aus") [] Acc  ;
+  SwitchOff = mkTransVerb (mkVerb (verbumWeak "schalten") "aus") [] Acc  ;
 
   John = mkProperName "Johann" ;
   Mary = mkProperName "Maria" ;

lib/resource-0.6/german/TypesGer.gf

@@ -75,7 +75,24 @@ param Degree = Pos | Comp | Sup ;
 -- We have a reduced conjugation with only the present tense infinitive, 
 -- indicative, and imperative forms, and past participles.
 
-param VForm = VInf | VInd Number Person | VImp Number | VPart AForm ;
+param VForm = VInf | 
+              VInd Number Person | 
+              VImp Number | 
+              VSubj Number Person | 
+              VImpfInd Number Person | 
+              VImpfSubj Number Person | 
+              VPresPart AForm | 
+              VPart AForm ;
+
+{--
+param Tense = Pres | Impf ;
+   VInf |
+   VInd Tense Number Person |
+   VSubj Tense Number Person |
+   VImp Number |
+   VPresPart AForm |
+   VPart AForm ;
+--}
 
 oper Verbum : Type = VForm => Str ;