resources and new instantiation syntax

lib/resource/swedish/BasicSwe.gf

@@ -0,0 +1,222 @@
+--# -path=.:../scandinavian:../abstract:../../prelude
+
+concrete BasicSwe of Basic = CategoriesSwe ** open NewParadigmsSwe in {
+
+flags startcat=Phr ; lexer=textlit ; parser=chart ; unlexer=text ;
+
+lin
+  airplane_N = regN "flygplan" neutrum ;
+  answer_V2S = mkV2S (regV "svara") "till" ;
+  apartment_N = mk2N "lägenhet" "lägenheter" ;
+  apple_N = regN "äpple" neutrum ;
+  art_N = mk2N "konst" "konster" ;
+  ask_V2Q = mkV2Q (regV "fråga") [] ;
+  baby_N = regN "bebis" utrum ;
+  bad_ADeg = irregADeg "dålig" "sämre" "sämst";
+  bank_N = mk2N "bank" "banker" ;
+  beautiful_ADeg = mk3ADeg "vacker" "vackert" "vackrast" ;
+  become_VA = mkVA (mkV "bli" "blir""bli" "blev" "blivit" "bliven") ;
+  beer_N = regN "öl" neutrum ;
+  beg_V2V = mkV2V (mkV "be" "ber""be" "blad" "bett" "bedd") [] "att" ;
+  big_ADeg = irregADeg "stor" "större" "störst";
+  bike_N = mk2N "cykel" "cyklar" ;
+  bird_N = mk2N "fågel" "fåglar" ;
+  black_ADeg = mk2ADeg "svart" "svart" ;
+  blue_ADeg = mk2ADeg "blå" "blått";
+  boat_N = regN "båt" utrum ;
+  book_N = mk2N "bok" "böcker" ;
+  boot_N = mk2N "stövel" "stövlar" ;
+  boss_N = mk2N "chef" "chefer" ;
+  boy_N = regN "pojke" utrum ;
+  bread_N = regN "bröd" neutrum ;
+  break_V2 = dirV2 (partV (mkV "slå" "slår" "slå" "slog" "slagit" "slagen") "sönder") ;
+  broad_ADeg = mk2ADeg "bred" "brett" ;
+  brother_N2 = mkN2 (mascN (mkN "bror" "brodern" "bröder" "bröderna")) "till" ;
+  brown_ADeg = regADeg "brun" ;
+  butter_N = regN "smör" neutrum ;
+  buy_V2 = dirV2 (mk2V "köpa" "köper") ;
+  camera_N = regN "kamera" utrum ;
+  cap_N = regN "mössa" utrum ;
+  car_N = regN "bil" utrum ;
+  carpet_N = regN "matta" utrum ;
+  cat_N = mk2N "katt" "katter" ;
+  ceiling_N = regN "tak" neutrum ;
+  chair_N = regN "stol" utrum ;
+  cheese_N = regN "ost" utrum ;
+  child_N = regN "barn" neutrum ;
+  church_N = regN "kyrka" utrum ;
+  city_N = mk2N "stad" "städer" ;
+  clean_ADeg = regADeg "ren" ;
+  clever_ADeg = regADeg "klok" ;
+  close_V2 = dirV2 (regV "stänga") ;
+  coat_N = regN "rock" utrum ;
+  cold_ADeg = regADeg "kall" ;
+  come_V = (mkV "komma" "kommer" "kom" "kom" "kommit" "kommen") ;
+  computer_N = mk2N "dator" "datorer" ;
+  country_N = mkN "land" "landet" "länder" "länderna" ;
+  cousin_N = mk2N "kusin" "kusinerna" ;
+  cow_N = mk2N "ko" "kor" ;
+  die_V = (mkV "dö" "dör" "dö" "dog" "dött" "dödd") ; ----
+  dirty_ADeg = regADeg "smutsig" ;
+  doctor_N = mk2N "läkare" "läkare" ;
+  dog_N = regN "hund" utrum ;
+  door_N = regN "dörr" utrum ;
+  drink_V2 = dirV2 (irregV "dricka" "drack" "druckit") ;
+  easy_A2V = mkA2V (mk2A "lätt" "lätt") "för" ;
+  eat_V2 = dirV2 (irregV "äta" "åt" "ätit") ;
+  enemy_N = regN "fiende" neutrum ;
+  factory_N = mk2N "fabrik" "fabriker" ;
+  father_N2 = mkN2 (mascN (mkN "far" "fadern" "fäder" "fäderna")) "till" ;
+  fear_VS = mkVS (regV "frukta") ;
+  find_V2 = dirV2 (irregV "finna" "fann" "funnit") ;
+  fish_N = mk2N "fisk" "fiskar" ;
+  floor_N = regN "golv" neutrum ;
+  forget_V2 = dirV2 (mkV "glömma" "glömmer" "glöm" "glömde" "glömt" "glömd") ;
+  fridge_N = regN "kylskåp" neutrum ;
+  friend_N = mkN "vän" "vännen" "vänner" "vännerna" ;
+  fruit_N = mk2N "frukt" "frukter" ;
+  fun_AV = mkAV (regA "rolig") ;
+  garden_N = regN "trädgård" utrum ;
+  girl_N = regN "flicka" utrum ;
+  glove_N = regN "handske" utrum ;
+  gold_N = regN "guld" neutrum ;
+  good_ADeg = mkADeg "god" "gott" "goda" "goda" "bättre" "bäst" "bästa" ;
+  go_V = (mkV "gå" "går" "gå" "gick" "gått" "gången") ;
+  green_ADeg = regADeg "grön" ;
+  harbour_N = regN "hamn" utrum;
+  hate_V2 = dirV2 (regV "hata") ;
+  hat_N = regN "hatt" utrum ;
+  have_V2 = dirV2 (mkV "ha" "har" "ha" "hade" "haft" "haft") ; ---- pp
+  hear_V2 = dirV2 (mkV "höra" "hör" "hör" "hörde" "hört" "hörd") ;
+  hill_N = regN "kulle" utrum ;
+  hope_VS = mkVS (depV (regV "hoppas")) ;
+  horse_N = regN "häst" utrum ;
+  hot_ADeg = regADeg "het" ;
+  house_N = regN "hus" neutrum ;
+  important_ADeg = regADeg "viktig" ;
+  industry_N = mk2N "industri" "industrier" ; ---- "ien" ??
+  iron_N = regN "järn" neutrum ;
+  king_N = mascN (regN "kung" utrum) ;
+  know_V2 = dirV2 (mkV "veta" "vet" "vet" "visste" "vetat" "visst") ;
+  lake_N = mkN "sjö" "sjön" "sjöar" "sjöarna" ;
+  lamp_N = regN "lampa" utrum;
+  learn_V2 = dirV2 (mkV "lära" "lär" "lär" "lärde" "lärt" "lärd") ; ---- refl!
+  leather_N = mkN "läder" "lädret" "läder" "lädren" ;
+  leave_V2 = dirV2 (regV "lämna") ;
+  like_V2 = mkV2 (mk2V "tycka" "tycker") "om" ;
+  listen_V2 = dirV2 (regV "lyssna") ;
+  live_V = (irregV "leva" "levde" "levt") ; ---- ?
+  long_ADeg = irregADeg "lång" "längre" "längst" ;
+  lose_V2 = dirV2 (regV "förlora") ;
+  love_N = regN "kärlek" utrum ;
+  love_V2 = dirV2 (regV "älska") ;
+  man_N = mascN (mkN "man" "mannen" "män" "männen") ;
+  married_A2 = mkA2 (mk2A "gift" "gift") "med" ;
+  meat_N = regN "kött" neutrum ;
+  milk_N = regN "mjölk" utrum ; ---- -ar?
+  moon_N = regN "måne" utrum ;
+  mother_N2 = mkN2 (mkN "mor" "modern" "mödrar" "mödrarna") "till" ;
+  mountain_N = regN "berg" neutrum ;
+  music_N = mk2N "musik" "musiker" ; ---- er ?
+  narrow_ADeg = regADeg "smal" ;
+  new_ADeg = mkADeg "ny" "nytt" "nya" "nya" "nyare" "nyast" "nyaste" ;
+  newspaper_N = regN "tidning" utrum ;
+
+  oil_N = regN "olja" utrum ;
+  old_ADeg = mkADeg "gammal" "gammalt" "gamla" "gamla" "äldre" "äldst" "äldsta" ;
+  open_V2 = dirV2 (regV "öppna") ;
+  paint_V2A = mkV2A (regV "måla") [] ;
+  paper_N = mkN "papper" "pappret" "papper" "pappren" ;
+  peace_N = regN "fred" utrum ; ---- ar?
+  pen_N = regN "penna" utrum ;
+  planet_N = mk2N "planet" "planeter" ;
+  plastic_N = mk2N "plastic" "plastiker" ;
+  play_V2 = dirV2 (regV "spela") ;
+  policeman_N = mk2N "polis" "poliser" ;
+  priest_N = mk2N "präst" "präster" ;
+  probable_AS = mkAS (regA "sannolik") ;
+  queen_N = regN "drottning" utrum ;
+  radio_N = regN "radio" utrum ; ----
+  rain_V0 = mkV0 (regV "regna") ;
+  read_V2 = dirV2 (mk2V "läsa" "läser") ;
+  red_ADeg = mk2ADeg "röd" "rött" ;
+  religion_N = mk2N "religion" "religioner" ;
+  restaurant_N = mk2N "restaurang" "restauranger" ;
+  river_N = mkN "å" "ån" "åar" "åarna" ;
+  rock_N = regN "sten" utrum ;
+  roof_N = regN "tak" neutrum ;
+  rubber_N = mkN "gummi" "gummit" "gummin" "gummina" ;
+  run_V = (irregV "springa" "sprang" "sprungit") ;
+  say_VS = mkVS (mkV "säga" "säger" "säg" "sade" "sagt" "sagd") ;
+  school_N = regN "skola" utrum;
+  science_N = mk2N "vetenskap" "vetenskaper" ;
+  sea_N = mkN "sjö" "sjön" "sjöar" "sjöarna" ;
+  seek_V2 = dirV2 (mk2V "söka" "söker") ;
+  see_V2 = dirV2 (mkV "se" "ser" "se" "såg" "sett" "sedd") ;
+  sell_V3 = dirV3 (irregV "sälja" "sålde" "sålt") "to" ;
+  send_V3 = dirV3 (regV "skicka") "till" ;
+  sheep_N = mk2N "får" "får" ;
+  ship_N = regN "skepp" neutrum ;
+  shirt_N = regN "skjorta" utrum ;
+  shoe_N = regN "sko" utrum ;
+  shop_N = mk2N "affär" "affären" ;
+  short_ADeg = regADeg "kort" ;
+  silver_N = mkN "silver" "silvret" "silver" "silvren" ;
+  sister_N = mk2N "syster" "systrar" ;
+  sleep_V = (irregV "sova" "sov" "sovit") ;
+  small_ADeg = mkADeg "liten" "litet" "lilla" "små" "mindre" "minst" "minsta" ;
+  snake_N = regN "orm" utrum ;
+  sock_N = regN "strumpa" utrum ;
+  speak_V2 = dirV2 (regV "tala") ;
+  star_N = regN "stjärna" utrum ;
+  steel_N = regN "stål" utrum ;
+  stone_N = regN "sten" utrum ;
+  stove_N = regN "spis" utrum ;
+  student_N = mk2N "student" "studenter" ;
+  stupid_ADeg = mk3ADeg "dum" "dumt" "dumma" ;
+  sun_N = regN "sol" utrum ;
+  switch8off_V2 = dirV2 (partV (irregV "stänga" "stängde" "stängt") "av") ;
+  switch8on_V2 = dirV2 (partV (irregV "slå" "slog" "slagit") "på") ;
+  table_N = regN "bord" neutrum ;
+  talk_V3 = mkV3 (regV "prata") "till" "om" ;
+  teacher_N = mk2N "lärare" "lärare" ;
+  teach_V2 = dirV2 (regV "undervisa") ;
+  television_N = mk2N "television" "televisioner" ;
+  thick_ADeg = regADeg "tjock" ;
+  thin_ADeg = mk2ADeg "tunn" "tunt" ;
+  train_N = regN "tåg" neutrum ;
+  travel_V = mk2V "resa" "reser" ;
+  tree_N = regN "träd" neutrum ;
+  ----  trousers_N = regN "trousers" ; ---- pl t !
+  ugly_ADeg = regADeg "ful" ;
+  understand_V2 = dirV2 (mkV "förstå" "förstår" "förstå" "förstod" "förstått" "förstådd") ;
+  university_N = regN "universitet" neutrum ;
+  village_N = mkN "by" "byn" "byar" "byarna" ;
+  wait_V2 = mkV2 (regV "vänta") "på" ;
+  walk_V = (mkV "gå" "går" "gå" "gick" "gått" "gången") ;
+  warm_ADeg = regADeg "varm" ;
+  war_N = regN "krig" neutrum ;
+  watch_V2 = mkV2 (regV "titta") "på" ;
+  water_N = mkN "vatten" "vattnet" "vatten" "vattnen" ;
+  white_ADeg = regADeg "vit" ;
+  window_N = mkN "fönster" "fönstret" "fönster" "fönstren" ;
+  wine_N = mkN "vin" "vinet" "viner" "vinerna" ; ----
+  win_V2 = dirV2 (irregV "vinna" "vann" "vunnit") ;
+  woman_N = regN "kvinna" utrum ;
+  wonder_VQ = mkVQ (regV "undra") ;
+  wood_N = mkN "trä" "träet" "träen" "träena" ; ---- ?
+  write_V2 = dirV2 (irregV "skriva" "skrev" "skrivit") ;
+  yellow_ADeg = regADeg "gul" ;
+  young_ADeg = irregADeg "ung" "yngre" "yngst" ;
+
+  do_V2 = dirV2 (mkV "göra" "gör" "gör" "gjorde" "gjort" "gjord") ;
+  now_Adv = mkAdv "nu" ;
+  already_Adv = mkAdv "redan" ;
+  song_N = mk2N "sång" "sånger" ;
+  add_V3 = mkV3 (partV (irregV "lägga" "lade" "lagt") "till") [] "till" ;
+  number_N = mkN "nummer" "numret" "numren" "numren" ;
+  put_V2 = mkV2 (irregV "sätta" "satte" "satt") [] ;
+  stop_V = regV "stanna" ;
+  jump_V = regV "hoppa" ;
+
+} ;

lib/resource/swedish/ClauseSwe.gf

@@ -1,3 +1,4 @@
 --# -path=.:../scandinavian:../abstract:../../prelude
 
-concrete ClauseSwe of Clause = ClauseScand with (SyntaxScand=SyntaxSwe) ;
+concrete ClauseSwe of Clause = CategoriesSwe **
+  ClauseScand with (SyntaxScand=SyntaxSwe) ;

lib/resource/swedish/MorphoSwe.gf

@@ -10,69 +10,268 @@
 
 resource MorphoSwe = TypesSwe ** open Prelude in {
 
+-- Nouns
+
 oper
-  mkVerbPart : (supa,super,sup,söp,supit,supen,upp : Str) -> Verb = 
-   \finna,finner,finn,fann,funnit,funnen,upp ->
+  mkNoun : (apa,apan,apor,aporna : Str) -> Subst =
+  \apa,apan,apor,aporna ->  
+ {s = table {
+    SF Sg Indef c => mkCase c apa ;
+    SF Sg Def c => mkCase c apan ;
+    SF Pl Indef c => mkCase c apor ;
+    SF Pl Def c => mkCase c aporna
+    } ;
+  h1 = case last apan of {
+    "n" => Utr ;
+    _ => Neutr
+    }
+  } ;
+
+  reg2Noun : Str -> Str -> Subst = \bil,bilar -> 
+   let 
+     l  = last bil ;
+     b  = Predef.tk 2 bil ; 
+     ar = Predef.dp 2 bilar 
+   in 
+   case ar of {
+      "or" => case l of {
+         "a" => decl1Noun bil ;
+         "r" => sLik bil ;
+         "o" => mkNoun bil (bil + "n")  bilar (bilar + "na") ;
+         _   => mkNoun bil (bil + "en") bilar (bilar + "na")
+         } ;
+      "ar" => ifTok Subst (Predef.tk 2 bilar) bil 
+                 (decl2Noun bil)
+                 (case l of {
+                    "e" => decl2Noun bil ;
+                    _   => mkNoun bil (bil + "n") bilar (bilar + "na") 
+                    }
+                 ) ;
+      "er" => decl3Noun bil ;
+      "en" => ifTok Subst bil bilar (sLik bil) (sRike bil) ; -- ben-ben
+      _ => ifTok Subst bil bilar (
+             case Predef.dp 3 bil of {
+                "are" => sKikare (init bil) ; 
+                _ => decl5Noun bil
+                }
+             )
+             (decl5Noun bil) --- rest case with lots of garbage
+      } ; 
+         
+--- this is a very rough heuristic as regards "ar/er"
+
+  regNoun : Str -> Gender -> Subst = \bil,g -> case g of {
+    Utr => case last bil of {
+      "a" => decl1Noun bil ;
+      _   => decl2Noun bil
+      } ;
+    Neutr => case last bil of {
+      "e" => sRike bil ;
+      _   => decl5Noun bil
+      }
+    } ;
+
+
+  decl1Noun : Str -> Subst = \apa -> sApa (init apa) ;
+
+  decl2Noun : Str -> Subst = \bil ->
+    case last bil of {
+      "e" => sPojke (init bil) ;
+      _ => mkNoun bil (bil + "en") (bil + "ar") (bil + "arna")
+      } ;
+
+  decl3Noun : Str -> Subst = \sak ->
+    case last sak of {
+      "e" => sVarelse (init sak) ;
+      "å" => sNivå sak ;
+      _ => mkNoun sak (sak + "en") (sak + "er") (sak + "erna")
+      } ;
+
+  decl5Noun : Str -> Subst = \lik ->
+    mkNoun lik (lik + "et") lik (lik + "en") ;
+
+
+-- Adjectives
+
+
+mkAdjPos : Str -> Str -> Str -> Str -> AdjFormPos -> Str ;
+mkAdjPos liten litet lilla sma a = case a of {
+  Strong gn => case gn of {
+    ASg Utr => liten ;
+    ASg Neutr => litet ;
+    APl => sma
+    } ;
+  Weak sn => case sn of {
+    AxSg NoMasc => lilla ;
+    AxSg Masc => init lilla + "e" ;
+    AxPl => sma
+   }
+  } ;
+
+-- The worst-case macro for the full declension (including comparison forms)
+-- is not so much worse.
+
+mkAdjective : Str -> Str -> Str -> Str -> 
+                     Str -> Str -> Str -> Adj ;
+mkAdjective liten litet lilla sma mindre minst minsta = {s = table {
+  AF (Posit p) c => mkCase c (mkAdjPos liten litet lilla sma p) ;
+  AF Compar  c   => mkCase c mindre ;
+  AF (Super SupStrong) c => mkCase c minst ;
+  AF (Super SupWeak) c   => mkCase c minsta
+  } 
+} ;
+
+-- It is handy to extract the positive part of a declension only, if
+-- the other comparicon forms aren't needed or don't make sense.
+
+extractPositive : Adj -> {s : AdjFormPos => Case => Str} ;
+extractPositive adj = {s = \\a,c => adj.s ! (AF (Posit a) c)} ;
+
+-- The notion of 'moderately irregular adjective' covers almost all adjectives.
+
+adjIrreg : (_,_,_,_ : Str) -> Adj ;
+adjIrreg god gott battre bast = 
+  mkAdjective god gott (god + "a") (god + "a") battre bast (bast + "a") ;
+
+-- Often it is possible to derive the $Pos Sg Neutr$ form even if the
+-- comparison forms are irregular.
+
+adjIrreg3 : (_,_,_: Str) -> Adj ;
+adjIrreg3 ung yngre yngst = adjIrreg ung (ung + "t") yngre yngst ;
+
+-- Some adjectives must be given $Pos Sg Utr$ $Pos Sg Neutr$, and $Pos Pl$,
+-- e.g. those ending with unstressed "en".
+
+adjAlmostReg : (_,_,_: Str) -> Adj ;
+adjAlmostReg ljummen ljummet ljumma = 
+  mkAdjective ljummen ljummet ljumma ljumma 
+              (ljumma + "re") (ljumma + "st") (ljumma + "ste") ;
+
+adjReg : Str -> Adj = \fin -> adjAlmostReg fin (fin + "t") (fin + "a") ;
+
+adj2Reg : Str -> Str -> Adj = \vid,vitt -> adjAlmostReg vid vitt (vid + "a") ;
+
+
+-- Verbs
+
+  mkVerb : (supa,super,sup,söp,supit,supen : Str) -> Verb = 
+   \finna,finner,finn,fann,funnit,funnen ->
     let funn = ptPretForms funnen in
     {s = table {
-    VF (Pres Ind Act) => finner ;
-    VF (Pres Ind Pass) => finn + "s" ;
-    VF (Pres Cnj Act) => finn + "e" ;
-    VF (Pres Cnj Pass) => finn + "es" ;
-    VF (Pret Ind Act) => fann ;
-    VF (Pret Ind Pass) => fann + "s" ;
-    VF (Pret Cnj Act) => fann ;        --- = ind
-    VF (Pret Cnj Pass) => fann + "s" ; --- 
-    VF Imper => finn ;
-    VI (Inf Act) => finna ;
-    VI (Inf Pass) => finna + "s" ;
-    VI (Supin Act) => funnit ;
-    VI (Supin Pass) => funnit + "s" ;
-    VI (PtPres Nom) => finn + "ande" ;
-    VI (PtPres Gen) => finn + "andes" ;
+    VF (Pres Act) => finner ;
+    VF (Pres Pass) => mkVoice Pass finn ;
+    VF (Pret v) => mkVoice v fann ;
+    VF (Imper v) => mkVoice v finn ;
+    VI (Inf v) => mkVoice v finna ;
+    VI (Supin v) => mkVoice v funnit ;
     VI (PtPret a c) => funn ! a ! c
     } ;
-     s1 = upp
-    } ;
+     s1 = []
+   } ;
 
-ptPretForms : Str -> AdjFormPos => Case => Str = \funnen -> \\a,c =>  
-  mkCase c (
- {- ----
-    case Predef.dp 2 funnen of {
-   "en" => let funn : Str = Predef.tk 2 funnen in 
-     case a of {
-      (Strong (ASg Utr)) => funn + "en" ;
-      (Strong (ASg Neutr)) => funn + "et" ;
-      (Strong APl) => funn + "a" ;
-      (Weak (AxSg NoMasc)) => funn + "a" ;
-      (Weak (AxSg Masc)) => funn + "e" ;
-      (Weak AxPl) => funn + "a" 
-    } ;
-  "ad" => let funn : Str = Predef.tk 2 funnen in 
-     case a of {
-      (Strong (ASg Utr)) => funn + "ad" ;
-      (Strong (ASg Neutr)) => funn + "at" ;
-      (Strong APl) => funn + "ade" ;
-      (Weak _) => funn + "ade"
-    } ;
+  vFinna : (_,_,_ : Str) -> Verb = \finn, fann, funn -> 
+    mkVerb (finn + "a") (finn + "er") finn fann (funn + "it") (funn + "en") ;
 
-  _ => 
--}
-  funnen ---- to be completed
- ---- }
- ) ;
+-- Now this is more general and subsumes $vFinna$.
+
+  vSälja : (_,_,_ : Str) -> Verb = \sälja, sålde, sålt -> 
+    let
+      a = last sälja ; 
+      sälj = case a of {
+        "a" => init sälja ;
+        _ => sälja
+        } ;
+      er = case a of {
+        "a" => "er" ;
+        _ => "r"
+        } ;
+      såld = case Predef.dp 2 sålt of {
+        "it" => Predef.tk 2 sålt + "en" ;
+        _ => init sålt + "d"
+        }
+    in 
+    mkVerb sälja (sälj + er) sälj sålde sålt såld ;
+
+  regVerb : (_,_ : Str) -> Verb = \tala,talar -> 
+    let 
+      ar    = Predef.dp 2 talar ;
+      tal   = Predef.tk 2 talar ;
+      forms = case ar of {
+        "ar" => vTala tal ;
+        "er" => vLeka tal ;
+        _    => case last tala of {
+          "a" => mkVerb tala talar tal (tal + "de") (tala + "t") (tala + "d") ;
+          _ => mkVerb tala talar tala (tala + "dde") (tala + "tt") (tala + "dd")
+          }
+        }
+      in forms ** {s1 = []} ;
+
+  ptPretForms : Str -> AdjFormPos => Case => Str = \funnen -> \\a,c =>  
+  let 
+    funn  = Predef.tk 2 funnen ;
+    en    = Predef.dp 2 funnen ;
+    funne = init funnen ;
+    n     = last funnen ;
+    m     = case last funn of {
+      "n" => [] ;
+      _ => "n"
+      } ;
+    funna = case en of {
+     "en" => case a of {
+       (Strong (ASg Utr)) => funn + "en" ;
+       (Strong (ASg Neutr)) => funn + "et" ;
+       (Weak (AxSg Masc)) => funn + m + "e" ;
+       _ => funn + m + "a"
+       } ;
+     "dd" => case a of {
+       (Strong (ASg Utr)) => funn + "dd" ;
+       (Strong (ASg Neutr)) => funn + "tt" ;
+       (Weak (AxSg Masc)) => funn + "dde" ;
+       _ => funn + "dda"
+       } ;
+     "ad" => case a of {
+       (Strong (ASg Utr)) => funn + "ad" ;
+       (Strong (ASg Neutr)) => funn + "at" ;
+       _ => funn + "ade"
+       } ;
+     _ => case n of {
+       "d" => case a of {
+         (Strong (ASg Utr)) => funne + "d" ;
+         (Strong (ASg Neutr)) => funne + "t" ;
+         (Weak (AxSg Masc)) => funne + "de" ;
+         _ => funne + "da"
+         } ;
+       _ => case a of {
+         (Strong (ASg Utr)) => funne + "t" ;
+         (Strong (ASg Neutr)) => funne + "t" ;
+         (Weak (AxSg Masc)) => funne + "te" ;
+         _ => funne + "ta"
+         }
+      }
+  }
+  in 
+  mkCase c funna ;
 
 mkCase : Case -> Str -> Str = \c,f -> case c of {
       Nom => f ;
-      Gen => f + "s"
+      Gen => f + case last f of {
+        "s" => [] ;
+        _ => "s"
+        }
       } ;
 
+mkVoice : Voice -> Str -> Str = \c,f -> case c of {
+      Act  => f ;
+      Pass => f + case last f of {
+        "s" => "es" ;
+        _ => "s"
+        }
+      } ;
 
 -- The most common is a verb without a particle.
 
-  mkVerb : (_,_,_,_,_,_ : Str) -> Verb = \supa,super,sup,söp,supit,supen ->
-    mkVerbPart supa super sup söp supit supen [] ; 
-
+  mkVerbPart : (_,_,_,_,_,_,_ : Str) -> Verb = \supa,super,sup,söp,supit,supen,upp ->
+    {s = (mkVerb supa super sup söp supit supen).s} ** {s1 = upp} ; 
 
 -- Prepositions are just strings.
   Preposition = Str ;
@@ -524,21 +723,16 @@ oper aAbstrakt : Str -> Adj = \abstrakt ->
 
 oper vTala : Str -> Verbum = \tal -> 
  {s = table {
-    VF (Pres Ind Act) => tal + "ar" ;
-    VF (Pres Ind Pass) => tal + "as" ;
-    VF (Pres Cnj Act) => tal + "e" ;
-    VF (Pres Cnj Pass) => tal + "es" ;
-    VF (Pret Ind Act) => tal + "ade" ;
-    VF (Pret Ind Pass) => tal + "ades" ;
-    VF (Pret Cnj Act) => tal + "ade" ;
-    VF (Pret Cnj Pass) => tal + "ades" ;
-    VF Imper => tal + "a" ;
+    VF (Pres Act) => tal + "ar" ;
+    VF (Pres Pass) => tal + "as" ;
+    VF (Pret Act) => tal + "ade" ;
+    VF (Pret Pass) => tal + "ades" ;
+    VF (Imper Act) => tal + "a" ;
+    VF (Imper Pass) => tal + "as" ;
     VI (Inf Act) => tal + "a" ;
     VI (Inf Pass) => tal + "as" ;
     VI (Supin Act) => tal + "at" ;
     VI (Supin Pass) => tal + "ats" ;
-    VI (PtPres Nom) => tal + "ande" ;
-    VI (PtPres Gen) => tal + "andes" ;
     VI (PtPret (Strong (ASg Utr)) Nom) => tal + "ad" ;
     VI (PtPret (Strong (ASg Utr)) Gen) => tal + "ads" ;
     VI (PtPret (Strong (ASg Neutr)) Nom) => tal + "at" ;
@@ -556,21 +750,15 @@ oper vTala : Str -> Verbum = \tal ->
 
 oper vLeka : Str -> Verbum = \lek -> 
  {s = table {
-    VF (Pres Ind Act) => lek + "er" ;
-    VF (Pres Ind Pass) => variants {lek + "s" ; lek + "es"} ;
-    VF (Pres Cnj Act) => lek + "e" ;
-    VF (Pres Cnj Pass) => lek + "es" ;
-    VF (Pret Ind Act) => lek + "te" ;
-    VF (Pret Ind Pass) => lek + "tes" ;
-    VF (Pret Cnj Act) => lek + "te" ;
-    VF (Pret Cnj Pass) => lek + "tes" ;
-    VF Imper => lek ;
+    VF (Pres Act) => lek + "er" ;
+    VF (Pres Pass) => mkVoice Pass lek ;
+    VF (Pret Act) => lek + "te" ;
+    VF (Pret Pass) => lek + "tes" ;
+    VF (Imper v) => mkVoice v lek ;
     VI (Inf Act) => lek + "a" ;
     VI (Inf Pass) => lek + "as" ;
     VI (Supin Act) => lek + "t" ;
     VI (Supin Pass) => lek + "ts" ;
-    VI (PtPres Nom) => lek + "ande" ;
-    VI (PtPres Gen) => lek + "andes" ;
     VI (PtPret (Strong (ASg Utr)) Nom) => lek + "t" ;
     VI (PtPret (Strong (ASg Utr)) Gen) => lek + "ts" ;
     VI (PtPret (Strong (ASg Neutr)) Nom) => lek + "t" ;
@@ -588,21 +776,16 @@ oper vLeka : Str -> Verbum = \lek ->
 
 oper vTyda : Str -> Verbum = \ty -> 
  {s = table {
-    VF (Pres Ind Act) => ty + "der" ;
-    VF (Pres Ind Pass) => variants {ty + "ds" ; ty + "des"} ;
-    VF (Pres Cnj Act) => ty + "de" ;
-    VF (Pres Cnj Pass) => ty + "des" ;
-    VF (Pret Ind Act) => ty + "dde" ;
-    VF (Pret Ind Pass) => ty + "ddes" ;
-    VF (Pret Cnj Act) => ty + "dde" ;
-    VF (Pret Cnj Pass) => ty + "ddes" ;
-    VF Imper => ty + "d" ;
+    VF (Pres Act) => ty + "der" ;
+    VF (Pres Pass) => variants {ty + "ds" ; ty + "des"} ;
+    VF (Pret Act) => ty + "dde" ;
+    VF (Pret Pass) => ty + "ddes" ;
+    VF (Imper Act) => ty + "d" ;
+    VF (Imper Pass) => ty + "ds" ;
     VI (Inf Act) => ty + "da" ;
     VI (Inf Pass) => ty + "das" ;
     VI (Supin Act) => ty + "tt" ;
     VI (Supin Pass) => ty + "tts" ;
-    VI (PtPres Nom) => ty + "dande" ;
-    VI (PtPres Gen) => ty + "dandes" ;
     VI (PtPret (Strong (ASg Utr)) Nom) => ty + "dd" ;
     VI (PtPret (Strong (ASg Utr)) Gen) => ty + "dds" ;
     VI (PtPret (Strong (ASg Neutr)) Nom) => ty + "tt" ;
@@ -620,21 +803,16 @@ oper vTyda : Str -> Verbum = \ty ->
 
 oper vVända : Str -> Verbum = \vän -> 
  {s = table {
-    VF (Pres Ind Act) => vän + "der" ;
-    VF (Pres Ind Pass) => variants {vän + "ds" ; vän + "des"} ;
-    VF (Pres Cnj Act) => vän + "de" ;
-    VF (Pres Cnj Pass) => vän + "des" ;
-    VF (Pret Ind Act) => vän + "de" ;
-    VF (Pret Ind Pass) => vän + "des" ;
-    VF (Pret Cnj Act) => vän + "de" ;
-    VF (Pret Cnj Pass) => vän + "des" ;
-    VF Imper => vän + "d" ;
+    VF (Pres Act) => vän + "der" ;
+    VF (Pres Pass) => variants {vän + "ds" ; vän + "des"} ;
+    VF (Pret Act) => vän + "de" ;
+    VF (Pret Pass) => vän + "des" ;
+    VF (Imper Act) => vän + "d" ;
+    VF (Imper Pass) => vän + "ds" ;
     VI (Inf Act) => vän + "da" ;
     VI (Inf Pass) => vän + "das" ;
     VI (Supin Act) => vän + "t" ;
     VI (Supin Pass) => vän + "ts" ;
-    VI (PtPres Nom) => vän + "dande" ;
-    VI (PtPres Gen) => vän + "dandes" ;
     VI (PtPret (Strong (ASg Utr)) Nom) => vän + "d" ;
     VI (PtPret (Strong (ASg Utr)) Gen) => vän + "ds" ;
     VI (PtPret (Strong (ASg Neutr)) Nom) => vän + "t" ;
@@ -652,21 +830,16 @@ oper vV
 
 oper vByta : Str -> Verbum = \by -> 
  {s = table {
-    VF (Pres Ind Act) => by + "ter" ;
-    VF (Pres Ind Pass) => variants {by + "ts" ; by + "tes"} ;
-    VF (Pres Cnj Act) => by + "te" ;
-    VF (Pres Cnj Pass) => by + "tes" ;
-    VF (Pret Ind Act) => by + "tte" ;
-    VF (Pret Ind Pass) => by + "ttes" ;
-    VF (Pret Cnj Act) => by + "tte" ;
-    VF (Pret Cnj Pass) => by + "ttes" ;
-    VF Imper => by + "t" ;
+    VF (Pres Act) => by + "ter" ;
+    VF (Pres Pass) => variants {by + "ts" ; by + "tes"} ;
+    VF (Pret Act) => by + "tte" ;
+    VF (Pret Pass) => by + "ttes" ;
+    VF (Imper Act) => by + "t" ;
+    VF (Imper Pass) => by + "ts" ;
     VI (Inf Act) => by + "ta" ;
     VI (Inf Pass) => by + "tas" ;
     VI (Supin Act) => by + "tt" ;
     VI (Supin Pass) => by + "tts" ;
-    VI (PtPres Nom) => by + "tande" ;
-    VI (PtPres Gen) => by + "tandes" ;
     VI (PtPret (Strong (ASg Utr)) Nom) => by + "tt" ;
     VI (PtPret (Strong (ASg Utr)) Gen) => by + "tts" ;
     VI (PtPret (Strong (ASg Neutr)) Nom) => by + "tt" ;
@@ -682,55 +855,18 @@ oper vByta : Str -> Verbum = \by ->
     }
   } ;
 
-oper vGömma : Str -> Verbum = \göm -> 
- {s = table {
-    VF (Pres Ind Act) => göm + "mer" ;
-    VF (Pres Ind Pass) => variants {göm + "s" ; göm + "mes"} ;
-    VF (Pres Cnj Act) => göm + "me" ;
-    VF (Pres Cnj Pass) => göm + "mes" ;
-    VF (Pret Ind Act) => göm + "de" ;
-    VF (Pret Ind Pass) => göm + "des" ;
-    VF (Pret Cnj Act) => göm + "de" ;
-    VF (Pret Cnj Pass) => göm + "des" ;
-    VF Imper => göm ;
-    VI (Inf Act) => göm + "ma" ;
-    VI (Inf Pass) => göm + "mas" ;
-    VI (Supin Act) => göm + "t" ;
-    VI (Supin Pass) => göm + "ts" ;
-    VI (PtPres Nom) => göm + "mande" ;
-    VI (PtPres Gen) => göm + "mandes" ;
-    VI (PtPret (Strong (ASg Utr)) Nom) => göm + "d" ;
-    VI (PtPret (Strong (ASg Utr)) Gen) => göm + "ds" ;
-    VI (PtPret (Strong (ASg Neutr)) Nom) => göm + "t" ;
-    VI (PtPret (Strong (ASg Neutr)) Gen) => göm + "ts" ;
-    VI (PtPret (Strong APl) Nom) => göm + "da" ;
-    VI (PtPret (Strong APl) Gen) => göm + "das" ;
-    VI (PtPret (Weak (AxSg NoMasc)) Nom) => göm + "da" ;
-    VI (PtPret (Weak (AxSg NoMasc)) Gen) => göm + "das" ;
-    VI (PtPret (Weak (AxSg Masc)) Nom) => göm + "de" ;
-    VI (PtPret (Weak (AxSg Masc)) Gen) => göm + "des" ;
-    VI (PtPret (Weak AxPl) Nom) => göm + "da" ;
-    VI (PtPret (Weak AxPl) Gen) => göm + "das"
-    }
-  } ;
-
 oper vHyra : Str -> Verbum = \hyr -> 
  {s = table {
-    VF (Pres Ind Act) => hyr ;
-    VF (Pres Ind Pass) => variants {hyr + "s" ; hyr + "es"} ;
-    VF (Pres Cnj Act) => hyr + "e" ;
-    VF (Pres Cnj Pass) => hyr + "es" ;
-    VF (Pret Ind Act) => hyr + "de" ;
-    VF (Pret Ind Pass) => hyr + "des" ;
-    VF (Pret Cnj Act) => hyr + "de" ;
-    VF (Pret Cnj Pass) => hyr + "des" ;
-    VF Imper => hyr ;
+    VF (Pres Act) => hyr ;
+    VF (Pres Pass) => variants {hyr + "s" ; hyr + "es"} ;
+    VF (Pret Act) => hyr + "de" ;
+    VF (Pret Pass) => hyr + "des" ;
+    VF (Imper Act) => hyr ;
+    VF (Imper Pass) => hyr + "s" ;
     VI (Inf Act) => hyr + "a" ;
     VI (Inf Pass) => hyr + "as" ;
     VI (Supin Act) => hyr + "t" ;
     VI (Supin Pass) => hyr + "ts" ;
-    VI (PtPres Nom) => hyr + "ande" ;
-    VI (PtPres Gen) => hyr + "andes" ;
     VI (PtPret (Strong (ASg Utr)) Nom) => hyr + "d" ;
     VI (PtPret (Strong (ASg Utr)) Gen) => hyr + "ds" ;
     VI (PtPret (Strong (ASg Neutr)) Nom) => hyr + "t" ;
@@ -746,70 +882,6 @@ oper vHyra : Str -> Verbum = \hyr ->
     }
   } ;
 
-oper vTåla : Str -> Verbum = \tål -> 
- {s = table {
-    VF (Pres Ind Act) => tål ;
-    VF (Pres Ind Pass) => variants {tål + "s" ; tål + "es"} ;
-    VF (Pres Cnj Act) => tål + "e" ;
-    VF (Pres Cnj Pass) => tål + "es" ;
-    VF (Pret Ind Act) => tål + "de" ;
-    VF (Pret Ind Pass) => tål + "des" ;
-    VF (Pret Cnj Act) => tål + "de" ;
-    VF (Pret Cnj Pass) => tål + "des" ;
-    VF Imper => tål ;
-    VI (Inf Act) => tål + "a" ;
-    VI (Inf Pass) => tål + "as" ;
-    VI (Supin Act) => tål + "t" ;
-    VI (Supin Pass) => tål + "ts" ;
-    VI (PtPres Nom) => tål + "ande" ;
-    VI (PtPres Gen) => tål + "andes" ;
-    VI (PtPret (Strong (ASg Utr)) Nom) => tål + "d" ;
-    VI (PtPret (Strong (ASg Utr)) Gen) => tål + "ds" ;
-    VI (PtPret (Strong (ASg Neutr)) Nom) => tål + "t" ;
-    VI (PtPret (Strong (ASg Neutr)) Gen) => tål + "ts" ;
-    VI (PtPret (Strong APl) Nom) => tål + "da" ;
-    VI (PtPret (Strong APl) Gen) => tål + "das" ;
-    VI (PtPret (Weak (AxSg NoMasc)) Nom) => tål + "da" ;
-    VI (PtPret (Weak (AxSg NoMasc)) Gen) => tål + "das" ;
-    VI (PtPret (Weak (AxSg Masc)) Nom) => tål + "de" ;
-    VI (PtPret (Weak (AxSg Masc)) Gen) => tål + "des" ;
-    VI (PtPret (Weak AxPl) Nom) => tål + "da" ;
-    VI (PtPret (Weak AxPl) Gen) => tål + "das"
-    }
-  } ;
-
-oper vFinna : (_,_,_ : Str) -> Verbum = \finn, fann, funn -> 
- {s = table {
-    VF (Pres Ind Act) => finn + "er" ;
-    VF (Pres Ind Pass) => variants {finn + "s" ; finn + "es"} ;
-    VF (Pres Cnj Act) => finn + "e" ;
-    VF (Pres Cnj Pass) => finn + "es" ;
-    VF (Pret Ind Act) => fann ;
-    VF (Pret Ind Pass) => fann + "s" ;
-    VF (Pret Cnj Act) => funn + "e" ;
-    VF (Pret Cnj Pass) => funn + "es" ;
-    VF Imper => finn ;
-    VI (Inf Act) => finn + "a" ;
-    VI (Inf Pass) => finn + "as" ;
-    VI (Supin Act) => funn + "it" ;
-    VI (Supin Pass) => funn + "its" ;
-    VI (PtPres Nom) => finn + "ande" ;
-    VI (PtPres Gen) => finn + "andes" ;
-    VI (PtPret (Strong (ASg Utr)) Nom) => funn + "en" ;
-    VI (PtPret (Strong (ASg Utr)) Gen) => funn + "ens" ;
-    VI (PtPret (Strong (ASg Neutr)) Nom) => funn + "et" ;
-    VI (PtPret (Strong (ASg Neutr)) Gen) => funn + "ets" ;
-    VI (PtPret (Strong APl) Nom) => funn + "a" ;
-    VI (PtPret (Strong APl) Gen) => funn + "as" ;
-    VI (PtPret (Weak (AxSg NoMasc)) Nom) => funn + "a" ;
-    VI (PtPret (Weak (AxSg NoMasc)) Gen) => funn + "as" ;
-    VI (PtPret (Weak (AxSg Masc)) Nom) => funn + "e" ;
-    VI (PtPret (Weak (AxSg Masc)) Gen) => funn + "es" ;
-    VI (PtPret (Weak AxPl) Nom) => funn + "a" ;
-    VI (PtPret (Weak AxPl) Gen) => funn + "as"
-    }
-  } ;
-
 -- machine-generated exceptional inflection tables from rules.Swe.gf
 
 oper mor_1 : Subst = 
@@ -1065,86 +1137,18 @@ oper liten_1146 : Adj =
     }
   } ;
 
-oper giva_1147 : Verbum = 
- {s = table {
-    VF (Pres Ind Act) => variants {"giver" ; "ger"} ;
-    VF (Pres Ind Pass) => variants {"gives" ; "givs" ; "ges"} ;
-    VF (Pres Conj Act) => "give" ;
-    VF (Pres Conj Pass) => "gives" ;
-    VF (Pret Ind Act) => "gav" ;
-    VF (Pret Ind Pass) => "gavs" ;
-    VF (Pret Conj Act) => "give" ;
-    VF (Pret Conj Pass) => "gives" ;
-    VF Imper => variants {"giv" ; "ge"} ;
-    VI (Inf Act) => variants {"giva" ; "ge"} ;
-    VI (Inf Pass) => variants {"givas" ; "ges"} ;
-    VI (Supin Act) => "givit" ;
-    VI (Supin Pass) => "givits" ;
-    VI (PtPres Nom) => "givande" ;
-    VI (PtPres Gen) => "givandes" ;
-    VI (PtPret (Strong (ASg Utr)) Nom) => "given" ;
-    VI (PtPret (Strong (ASg Utr)) Gen) => "givens" ;
-    VI (PtPret (Strong (ASg Neutr)) Nom) => "givet" ;
-    VI (PtPret (Strong (ASg Neutr)) Gen) => "givets" ;
-    VI (PtPret (Strong APl) Nom) => "givna" ;
-    VI (PtPret (Strong APl) Gen) => "givnas" ;
-    VI (PtPret (Weak (AxSg NoMasc)) Nom) => "givna" ;
-    VI (PtPret (Weak (AxSg NoMasc)) Gen) => "givnas" ;
-    VI (PtPret (Weak (AxSg Masc)) Nom) => "givne" ;
-    VI (PtPret (Weak (AxSg Masc)) Gen) => "givnes" ;
-    VI (PtPret (Weak AxPl) Nom) => "givna" ;
-    VI (PtPret (Weak AxPl) Gen) => "givnas"
-    }
-  } ;
-
-oper gå_1174 : Verbum = 
- {s = table {
-    VF (Pres Ind Act) => "går" ;
-    VF (Pres Ind Pass) => "gås" ;
-    VF (Pres Cnj Act) => "gå" ;
-    VF (Pres Cnj Pass) => "gås" ;
-    VF (Pret Ind Act) => "gick" ;
-    VF (Pret Ind Pass) => "gicks" ;
-    VF (Pret Cnj Act) => "ginge" ;
-    VF (Pret Cnj Pass) => "ginges" ;
-    VF Imper => "gå" ;
-    VI (Inf Act) => "gå" ;
-    VI (Inf Pass) => "gås" ;
-    VI (Supin Act) => "gått" ;
-    VI (Supin Pass) => "gåtts" ;
-    VI (PtPres Nom) => "gående" ;
-    VI (PtPres Gen) => "gåendes" ;
-    VI (PtPret (Strong (ASg Utr)) Nom) => "gången" ;
-    VI (PtPret (Strong (ASg Utr)) Gen) => "gångens" ;
-    VI (PtPret (Strong (ASg Neutr)) Nom) => "gånget" ;
-    VI (PtPret (Strong (ASg Neutr)) Gen) => "gångets" ;
-    VI (PtPret (Strong APl) Nom) => "gångna" ;
-    VI (PtPret (Strong APl) Gen) => "gångnas" ;
-    VI (PtPret (Weak (AxSg NoMasc)) Nom) => "gångna" ;
-    VI (PtPret (Weak (AxSg NoMasc)) Gen) => "gångnas" ;
-    VI (PtPret (Weak (AxSg Masc)) Nom) => "gångne" ;
-    VI (PtPret (Weak (AxSg Masc)) Gen) => "gångnes" ;
-    VI (PtPret (Weak AxPl) Nom) => "gångna" ;
-    VI (PtPret (Weak AxPl) Gen) => "gångnas"
-    }
-  } ;
 oper hava_1198 : Verbum = 
  {s = table {
-    VF (Pres Ind Act) => variants {"haver" ; "har"} ;
-    VF (Pres Ind Pass) => variants {"havs" ; "has"} ;
-    VF (Pres Conj Act) => "have" ;
-    VF (Pres Conj Pass) => "haves" ;
-    VF (Pret Ind Act) => "hade" ;
-    VF (Pret Ind Pass) => "hades" ;
-    VF (Pret Conj Act) => "hade" ;
-    VF (Pret Conj Pass) => "hades" ;
-    VF Imper => variants {"hav" ; "ha"} ;
-    VI (Inf Act) => variants {"hava" ; "ha"} ;
-    VI (Inf Pass) => variants {"havas" ; "has"} ;
+    VF (Pres Act) => "har" ;
+    VF (Pres Pass) => "has" ;
+    VF (Pret Act) => "hade" ;
+    VF (Pret Pass) => "hades" ;
+    VF (Imper Act) => "ha" ;
+    VF (Imper Pass) => "has" ;
+    VI (Inf Act) => "ha" ;
+    VI (Inf Pass) => "has" ;
     VI (Supin Act) => "haft" ;
     VI (Supin Pass) => "hafts" ;
-    VI (PtPres Nom) => "havande" ;
-    VI (PtPres Gen) => "havandes" ;
     VI (PtPret (Strong (ASg Utr)) Nom) => variants {} ;
     VI (PtPret (Strong (ASg Utr)) Gen) => variants {} ;
     VI (PtPret (Strong (ASg Neutr)) Nom) => variants {} ;
@@ -1162,21 +1166,15 @@ oper hava_1198 : Verbum =
 
 oper vara_1200 : Verbum = 
  {s = table {
-    VF (Pres Ind Act) => "är" ;
-    VF (Pres Ind Pass) => variants {} ;
-    VF (Pres Conj Act) => "vare" ;
-    VF (Pres Conj Pass) => variants {} ;
-    VF (Pret Ind Act) => "var" ;
-    VF (Pret Ind Pass) => variants {} ;
-    VF (Pret Conj Act) => "vore" ;
-    VF (Pret Conj Pass) => variants {} ;
-    VF Imper => "var" ;
+    VF (Pres Act) => "är" ;
+    VF (Pres Pass) => variants {} ;
+    VF (Pret Act) => "var" ;
+    VF (Pret Pass) => variants {} ;
+    VF (Imper _) => "var" ;
     VI (Inf Act) => "vara" ;
     VI (Inf Pass) => variants {} ;
     VI (Supin Act) => "varit" ;
     VI (Supin Pass) => variants {} ;
-    VI (PtPres Nom) => "varande" ;
-    VI (PtPres Gen) => "varandes" ;
     VI (PtPret (Strong (ASg Utr)) Nom) => variants {} ;
     VI (PtPret (Strong (ASg Utr)) Gen) => variants {} ;
     VI (PtPret (Strong (ASg Neutr)) Nom) => variants {} ;
@@ -1205,6 +1203,4 @@ oper
   regTal : Str -> LinDigit = \fem -> 
     mkTal fem (fem + "ton") (fem + "tio") ;
 
-
-
 }

lib/resource/swedish/NewParadigmsSwe.gf

@@ -0,0 +1,348 @@
+--# -path=.:../scandinavian:../abstract:../../prelude
+
+--1 Swedish Lexical Paradigms UNDER RECONSTRUCTION!
+--
+-- Aarne Ranta 2003
+--
+-- This is an API to the user of the resource grammar 
+-- for adding lexical items. It gives functions for forming
+-- expressions of open categories: nouns, adjectives, verbs.
+-- 
+-- Closed categories (determiners, pronouns, conjunctions) are
+-- accessed through the resource syntax API, $Structural.gf$. 
+--
+-- The main difference with $MorphoEng.gf$ is that the types
+-- referred to are compiled resource grammar types. We have moreover
+-- had the design principle of always having existing forms, rather
+-- than stems, as string arguments of the paradigms.
+--
+-- The structure of functions for each word class $C$ is the following:
+-- first we give a handful of patterns that aim to cover all
+-- regular cases. Then we give a worst-case function $mkC$, which serves as an
+-- escape to construct the most irregular words of type $C$.
+-- However, this function should only seldom be needed: we have a
+-- separate module $IrregularEng$, which covers all irregularly inflected
+-- words.
+-- 
+-- The following modules are presupposed:
+
+resource NewParadigmsSwe = 
+  open (Predef=Predef), Prelude, TypesSwe, MorphoSwe, SyntaxSwe, ResourceSwe in {
+
+--2 Parameters 
+--
+-- To abstract over gender names, we define the following identifiers.
+
+oper
+  Gender : Type ; 
+
+  utrum     : Gender ;
+  neutrum   : Gender ;
+
+-- To abstract over number names, we define the following.
+
+  Number : Type ; 
+
+  singular : Number ;
+  plural   : Number ;
+
+-- To abstract over case names, we define the following.
+
+  Case : Type ;
+
+  nominative : Case ;
+  genitive   : Case ;
+
+-- Prepositions used in many-argument functions are just strings.
+
+  Preposition : Type = Str ;
+
+--2 Nouns
+
+-- Worst case: give all four forms. The gender is computed from the
+-- last letter of the second form (if "n", then $utrum$, otherwise $neutrum$).
+
+  mkN  : (apa,apan,apor,aporna : Str) -> N ;
+
+-- The regular function takes the singular indefinite form and the gender,
+-- and computes the other forms by a heuristic. 
+-- If in doubt, use the $cc$ command to test!
+
+  regN : Str -> Gender -> N ;
+
+-- In practice the worst case is often just: give singular and plural indefinite.
+
+  mk2N : (nyckel,nycklar : Str) -> N ;
+
+-- All nouns created by the previous functions are marked as
+-- $nonmasculine$. If you want a $masculine$ noun, wrap it with the following
+-- function:
+
+  mascN : N -> N ;
+
+--3 Compound nouns 
+--
+-- All the functions above work quite as well to form compound nouns,
+-- such as "fotboll". 
+
+
+--3 Relational nouns 
+-- 
+-- Relational nouns ("daughter of x") need a preposition. 
+
+  mkN2 : N -> Preposition -> N2 ;
+
+-- The most common preposition is "av", and the following is a
+-- shortcut for regular, $nonhuman$ relational nouns with "av".
+
+  regN2 : Str -> Gender -> N2 ;
+
+-- Use the function $mkPreposition$ or see the section on prepositions below to  
+-- form other prepositions.
+--
+-- Three-place relational nouns ("the connection from x to y") need two prepositions.
+
+  mkN3 : N -> Preposition -> Preposition -> N3 ;
+
+
+--3 Relational common noun phrases
+--
+-- In some cases, you may want to make a complex $CN$ into a
+-- relational noun (e.g. "the old town hall of").
+
+  cnN2 : CN -> Preposition -> N2 ;
+  cnN3 : CN -> Preposition -> Preposition -> N3 ;
+
+-- 
+--3 Proper names and noun phrases
+--
+-- Proper names, with a regular genitive, are formed as follows
+
+  regPN : Str -> Gender -> PN ;          -- John, John's
+
+-- To form a noun phrase that can also be plural and have an irregular
+-- genitive, you can use the worst-case function.
+
+  mkNP : Str -> Str -> Number -> Gender -> NP ; 
+
+--2 Adjectives
+
+-- Non-comparison one-place adjectives need for forms: 
+
+  mkA : (galen,galet,galna : Str) -> A ;
+
+-- For regular adjectives, the other forms are derived. 
+
+  regA : Str -> A ;
+
+-- In practice, two forms are enough.
+
+  mk2A : (bred,brett : Str) -> A ;
+ 
+--3 Two-place adjectives
+--
+-- Two-place adjectives need a preposition for their second argument.
+
+  mkA2 : A -> Preposition -> A2 ;
+
+-- Comparison adjectives may need as many as seven forms. 
+
+  mkADeg : (liten, litet, lilla, sma, mindre, minst, minsta : Str) -> ADeg ;
+
+-- The regular pattern works for many adjectives, e.g. those ending
+-- with "ig".
+
+  regADeg : Str -> ADeg ;
+
+-- Just the comparison forms can be irregular.
+
+  irregADeg : (tung,tyngre,tyngst : Str) -> ADeg ;
+
+-- Sometimes just the positive forms are irregular.
+
+  mk3ADeg : (galen,galet,galna : Str) -> ADeg ;
+  mk2ADeg : (bred,brett        : Str) -> ADeg ;
+
+-- If comparison is formed by "more, "most", as in general for
+-- long adjective, the following pattern is used:
+
+  compoundADeg : A -> ADeg ; -- -/more/most ridiculous
+
+-- From a given $ADeg$, it is possible to get back to $A$.
+
+  adegA : ADeg -> A ;
+
+
+--2 Adverbs
+
+-- Adverbs are not inflected. Most lexical ones have position
+-- after the verb. Some can be preverbal (e.g. "always").
+
+  mkAdv : Str -> Adv ;
+  mkAdV : Str -> AdV ;
+
+-- Adverbs modifying adjectives and sentences can also be formed.
+
+  mkAdA : Str -> AdA ;
+
+--2 Prepositions
+--
+-- A preposition is just a string.
+
+  mkPreposition : Str -> Preposition ;
+
+--2 Verbs
+--
+-- The worst case needs five forms.
+
+  mkV : (supa,super,sup,söp,supit,supen : Str) -> V ;
+
+-- The 'regular verb' function is the first conjugation.
+
+  regV : (tala : Str) -> V ;
+
+-- The almost regular verb function needs the infinitive and the present.
+
+  mk2V : (leka,leker : Str) -> V ;
+
+-- There is an extensive list of irregular verbs in the module $IrregularSwe$.
+-- In practice, it is enough to give three forms, as in school books.
+
+  irregV     : (dricka, drack, druckit  : Str) -> V ;
+
+
+--3 Verbs with a particle.
+--
+-- The particle, such as in "switch on", is given as a string.
+
+  partV  : V -> Str -> V ;
+
+--3 Deponent verbs.
+--
+-- Some words are used in passive forms only, e.g. "hoppas".
+
+  depV  : V -> V ;
+
+--3 Two-place verbs
+--
+-- Two-place verbs need a preposition, except the special case with direct object.
+-- (transitive verbs). Notice that a particle comes from the $V$.
+
+  mkV2  : V -> Preposition -> V2 ;
+
+  dirV2 : V -> V2 ;
+
+--3 Three-place verbs
+--
+-- Three-place (ditransitive) verbs need two prepositions, of which
+-- the first one or both can be absent.
+
+  mkV3     : V -> Str -> Str -> V3 ;    -- speak, with, about
+  dirV3    : V -> Str -> V3 ;           -- give,_,to
+  dirdirV3 : V -> V3 ;                  -- give,_,_
+
+--3 Other complement patterns
+--
+-- Verbs and adjectives can take complements such as sentences,
+-- questions, verb phrases, and adjectives.
+
+  mkV0  : V -> V0 ;
+  mkVS  : V -> VS ;
+  mkV2S : V -> Str -> V2S ;
+  mkVV  : V -> VV ;
+  mkV2V : V -> Str -> Str -> V2V ;
+  mkVA  : V -> VA ;
+  mkV2A : V -> Str -> V2A ;
+  mkVQ  : V -> VQ ;
+  mkV2Q : V -> Str -> V2Q ;
+
+  mkAS  : A -> AS ;
+  mkA2S : A -> Str -> A2S ;
+  mkAV  : A -> AV ;
+  mkA2V : A -> Str -> A2V ;
+
+
+--2 Definitions of the paradigms
+--
+-- The definitions should not bother the user of the API. So they are
+-- hidden from the document.
+--.
+
+  Gender = SyntaxSwe.NounGender ; 
+  Number = TypesSwe.Number ;
+  Case = TypesSwe.Case ;
+  utrum = NUtr NoMasc ; 
+  neutrum = NNeutr ;
+  singular = Sg ;
+  plural = Pl ;
+  nominative = Nom ;
+  genitive = Gen ;
+
+  mkN x y z u = extCommNoun (mkNoun x y z u) ** {lock_N = <>} ;
+  regN x g = extCommNoun (regNoun x (genNoun g)) ** {lock_N = <>} ;
+  mk2N x g = extCommNoun (reg2Noun x g) ** {lock_N = <>} ;
+  mascN n = {s = n.s ; g = NUtr Masc ; lock_N = <>} ;
+
+  mkN2 = \n,p -> UseN n ** {lock_N2 = <> ; s2 = p} ;
+  regN2 n g = mkN2 (regN n g) (mkPreposition "av") ;
+  mkN3 = \n,p,q -> UseN n ** {lock_N3 = <> ; s2 = p ; s3 = q} ;
+  cnN2 = \n,p -> n ** {lock_N2 = <> ; s2 = p} ;
+  cnN3 = \n,p,q -> n ** {lock_N3 = <> ; s2 = p ; s3 = q} ;
+
+  regPN n g = {s = \\c => mkCase c n ; g = g} ** {lock_PN = <>} ;
+  mkNP x y n g = 
+    {s = table {PGen _ => x ; _ => y} ; g = genNoun g ; n = n ; p = P3 ;
+     lock_NP = <>} ;
+
+  mkA a b c = extractPositive (adjAlmostReg a b c) ** {lock_A = <>} ;
+  mk2A a b = extractPositive (adj2Reg a b) ** {lock_A = <>} ;
+  regA a = extractPositive (adjReg a) ** {lock_A = <>} ;
+
+  mkA2 a p = a ** {s2 = p ; lock_A2 = <>} ;
+
+  mkADeg a b c d e f g = mkAdjective a b c d e f g ** {lock_ADeg = <>} ;
+  regADeg a = adjReg a ** {lock_ADeg = <>} ;
+  irregADeg a b c = adjIrreg3 a b c ** {lock_ADeg = <>} ;
+  mk3ADeg a b c = adjAlmostReg a b c ** {lock_ADeg = <>} ;
+  mk2ADeg a b = adj2Reg a b ** {lock_ADeg = <>} ;
+
+  mkAdv x = ss x ** {lock_Adv = <>} ;
+  mkAdV x = ss x ** {lock_AdV = <>} ;
+  mkAdA x = ss x ** {lock_AdA = <>} ;
+
+  mkPreposition p = p ;
+
+  mkV a b c d e f = mkVerb a b c d e f ** {s1 = [] ; lock_V = <>} ;
+
+  regV a = mk2V a (a + "r") ;
+  mk2V a b = regVerb a b ** {s1 = [] ; lock_V = <>} ;
+
+  irregV x y z =  vSälja x y z
+     ** {s1 = [] ; lock_V = <>} ;
+
+  partV v p = {s = v.s ; s1 = p ; lock_V = <>} ;
+  depV v = deponentVerb v ** {lock_V = <>} ;
+
+  mkV2 v p = v ** {s = v.s ; s1 = v.s1 ; s2 = p ; lock_V2 = <>} ;
+  dirV2 v = mkV2 v [] ;
+
+  mkV3 v p q = v ** {s = v.s ; s1 = v.s1 ; s2 = p ; s3 = q ; lock_V3 = <>} ;
+  dirV3 v p = mkV3 v [] p ;
+  dirdirV3 v = dirV3 v [] ;
+
+  mkV0  v = v ** {lock_V0 = <>} ;
+  mkVS  v = v ** {lock_VS = <>} ;
+  mkV2S v p = mkV2 v p ** {lock_V2S = <>} ;
+  mkVV  v = v ** {s3 = "att" ; lock_VV = <>} ;
+  mkV2V v p t = mkV2 v p ** {s3 = t ; lock_V2V = <>} ;
+  mkVA  v = v ** {lock_VA = <>} ;
+  mkV2A v p = mkV2 v p ** {lock_V2A = <>} ;
+  mkVQ  v = v ** {lock_VQ = <>} ;
+  mkV2Q v p = mkV2 v p ** {lock_V2Q = <>} ;
+
+  mkAS  v = v ** {lock_AS = <>} ;
+  mkA2S v p = mkA2 v p ** {lock_A2S = <>} ;
+  mkAV  v = v ** {lock_AV = <>} ;
+  mkA2V v p = mkA2 v p ** {lock_A2V = <>} ;
+
+} ;

lib/resource/swedish/RulesSwe.gf

@@ -1,4 +1,4 @@
 --# -path=.:../scandinavian:../abstract:../../prelude
 
-concrete RulesSwe of Rules =
+concrete RulesSwe of Rules = CategoriesSwe **
   RulesScand with (SyntaxScand=SyntaxSwe) ;

lib/resource/swedish/SyntaxSwe.gf

@@ -26,17 +26,6 @@ instance SyntaxSwe of SyntaxScand = TypesSwe **
       <Def,  Pl> => Weak AxPl
       } ;
 
-  deponentVerb : Verb -> Verb = \finna -> {
-    s = table {
-      VF (Pres m _) => finna.s ! VF (Pres m Pass) ;
-      VF (Pret m _) => finna.s ! VF (Pret m Pass) ;
-      VI (Inf _)    => finna.s ! VI (Inf Pass) ;
-      VI (Supin _)  => finna.s ! VI (Supin Pass) ;
-      v             => finna.s ! v --- Imper !
-      } ;
-    s1 = finna.s1
-    } ;
-
   verbVara = vara_1200 ** {s1 = []} ;
   verbHava = hava_1198 ** {s1 = []};
 
@@ -118,10 +107,6 @@ instance SyntaxSwe of SyntaxScand = TypesSwe **
 
 -- next
 
-  adjPastPart : Verb -> Adjective = \verb -> {
-    s = \\af,c => verb.s1 ++ verb.s ! VI (PtPret af c) --- på slagen
-    } ;
-
   reflPron : Number -> Person -> Str = \n,p -> case <n,p> of {
     <Sg,P1> => "mig" ;
     <Sg,P2> => "dig" ;
@@ -135,4 +120,14 @@ instance SyntaxSwe of SyntaxScand = TypesSwe **
       (mkVerb "hålla" "håller" "håll"  "höll" "hållit" "hållen" ** 
        {s3 = ["på att"]})
       (predVerbGroup True Simul verb) ;  
+
+  strPrep : ComplPrep -> Str = \p -> case p of {
+    CPnoPrep => [] ;
+    CPav => "av" ;
+    CPför => "för" ;
+    CPi => "i" ;
+    CPom => "om" ;
+    CPpå => "på" ;
+    CPtill => "till"
+    } ;
 }

lib/resource/swedish/TestResourceSwe.gf

@@ -1,7 +1,7 @@
 --# -path=.:../scandinavian:../abstract:../../prelude
 
 concrete TestResourceSwe of TestResource = 
--- RulesSwe, 
+RulesSwe, 
 ClauseSwe,
 StructuralSwe 
 ** 
@@ -28,17 +28,17 @@ lin
   House = extCommNoun (sHus "hus") ;
   Light = extCommNoun (sHus "ljus") ;
   Wine = extCommNoun (sParti "vin") ;
-  Walk = vNopart gå_1174 ;
+  Walk = vNopart (mkVerb "gå" "går" "gå" "gick" "gått" "gången") ;
   Run = vNopart (vFinna "spring" "sprang" "sprung") ;
   Drink = extTransVerb (vFinna "drick" "drack" "druck") [] ;
   Love = extTransVerb (vNopart (vTala "älsk")) [] ;
   Send = extTransVerb (vNopart (vTala "skick")) [] ;
   Wait = extTransVerb (vNopart (vTala "vänt")) "på" ;
-  Give = extTransVerb (vNopart (vFinna "giv" "gav" "giv")) [] ** {s3 = "till"} ; --- ge
+  Give = extTransVerb (vNopart (mkVerb "ge" "ger" "ge" "gav" "givit" "given")) [] ** {s3 = "till"} ;
   Prefer = extTransVerb (vNopart (vFinna "föredrag" "föredrog" "föredrag")) [] ** 
            {s3 = "framför"} ; --- föredra
 
-  Say = vNopart (vLeka "säg") ; --- works in present tense...
+  Say = vNopart (mkVerb "säga" "säger" "säg" "sade" "sagt" "sagd") ;
   Prove = vNopart (vTala "bevis") ;
   SwitchOn = mkDirectVerb (vFinna "sätt" "satte" "satt" ** {s1 = "på"}) ;
   SwitchOff = mkDirectVerb (vLeka "stäng" ** {s1 = "av"}) ;

lib/resource/swedish/TypesSwe.gf

@@ -23,14 +23,4 @@ oper
 param
   AdjFormPos = Strong GenNum | Weak SexNum ;
 
-  VFin = 
-   Pres Mode Voice
- | Pret Mode Voice
- | Imper ;         --- no passive
- 
-  VInf =
-   Inf Voice
- | Supin Voice
- | PtPres Case
- | PtPret AdjFormPos Case ;
 }