From 08f5d157b6f773a15c7b2946c2e8b829cf2ee60a Mon Sep 17 00:00:00 2001
From: aarne <unknown>
Date: Tue, 9 Aug 2005 20:30:45 +0000
Subject: [PATCH] some fixes to Wanjiku's list

---
 lib/resource/english/BasicEng.gf         |  2 +-
 lib/resource/finnish/BasicFin.gf         |  4 ++--
 lib/resource/finnish/CategoriesFin.gf    |  6 +++---
 lib/resource/finnish/ParadigmsFin.gf     |  6 +++---
 lib/resource/finnish/SyntaxFin.gf        | 12 ++++++------
 lib/resource/scandinavian/SyntaxScand.gf |  2 +-
 6 files changed, 16 insertions(+), 16 deletions(-)

diff --git a/lib/resource/english/BasicEng.gf b/lib/resource/english/BasicEng.gf
index 69578f721..0bd8ce415 100644
--- a/lib/resource/english/BasicEng.gf
+++ b/lib/resource/english/BasicEng.gf
@@ -85,7 +85,7 @@ lin
   girl_N = regN "girl" ;
   glove_N = regN "glove" ;
   gold_N = regN "gold" ;
-  good_ADeg = mkADeg "good" "better" "best" "well" ;
+  good_ADeg = mkADeg "good" "well" "better" "best" ;
   go_V = (mkV "go" "goes" "went" "gone" "going") ;
   green_ADeg = regADeg "green" ;
   harbour_N = regN "harbour" ;
diff --git a/lib/resource/finnish/BasicFin.gf b/lib/resource/finnish/BasicFin.gf
index edd928a95..f4d4a798a 100644
--- a/lib/resource/finnish/BasicFin.gf
+++ b/lib/resource/finnish/BasicFin.gf
@@ -69,7 +69,7 @@ lin
   dog_N = nLukko "koira" ;
   door_N = nArpi "ovi" ;
   drink_V2 = dirV2 (regV "juoda") ;
-  easy_A2V = mkA2V (mkA2 (mkA (nLukko "helppo")) allative) ;
+  easy_A2V = mkA2V (mkA2 (mkA (nLukko "helppo")) (caseP allative)) ;
   eat_V2 = dirV2 (regV "syödä") ;
   empty_ADeg = mkADeg (nLukko "tyhjä") "tyhjempi" "tyhjin" ;
   enemy_N = regN "vihollinen" ;
@@ -122,7 +122,7 @@ lin
   love_V2 = caseV2 (regV "rakastaa") partitive ;
   man_N = mkN "mies" "miehen" "miehenä" "miestä" "mieheen" 
             "miehinä" "miehissä" "miesten" "miehiä" "miehiin" human ;
-----  married_A2 = mkA2 (regA "married") "to" ;
+  married_A2 = mkA2 (mkA (regN "avioitunut")) (postpP genitive "kanssa") ;
   meat_N = nLukko "liha" ;
   milk_N = nLukko "maito" ;
   moon_N = regN "kuu" ;
diff --git a/lib/resource/finnish/CategoriesFin.gf b/lib/resource/finnish/CategoriesFin.gf
index 67a48d20c..2be88803e 100644
--- a/lib/resource/finnish/CategoriesFin.gf
+++ b/lib/resource/finnish/CategoriesFin.gf
@@ -37,13 +37,13 @@ lincat
 
   A      = Adjective ; 
       -- = CommonNoun ;
-  A2     = Adjective ** {c : ComplCase} ;
+  A2     = Adjective ** {s3 : Str ; p : Bool ; c : ComplCase} ;
   ADeg   = {s : Degree => AForm => Str} ;
   AP     = {s : AdjPos => AForm => Str} ;
   AS     = Adjective ; --- "more difficult for him to come than..."
-  A2S    = Adjective ** {c : ComplCase} ;
+  A2S    = Adjective ** {s3 : Str ; p : Bool ; c : ComplCase} ;
   AV     = Adjective ;
-  A2V    = Adjective ** {c : ComplCase} ;
+  A2V    = Adjective ** {s3 : Str ; p : Bool ; c : ComplCase} ;
 
   V      = Verb1 ; 
       -- = {s : VForm => Str}
diff --git a/lib/resource/finnish/ParadigmsFin.gf b/lib/resource/finnish/ParadigmsFin.gf
index 35f0e4db5..681061852 100644
--- a/lib/resource/finnish/ParadigmsFin.gf
+++ b/lib/resource/finnish/ParadigmsFin.gf
@@ -37,7 +37,7 @@ oper
   human    : Gender ;
   nonhuman : Gender ;
 
-  Number   : Type;
+  Number   : Type ;
 
   singular : Number ;
   plural   : Number ;
@@ -214,7 +214,7 @@ oper
 
 -- Two-place adjectives need a case for the second argument.
 
-  mkA2 : A -> Case -> A2 ;
+  mkA2 : A -> PPosition -> A2 ;
 
 -- Comparison adjectives have three forms. The comparative and the superlative
 -- are always inflected in the same way, so the nominative of them is actually
@@ -482,7 +482,7 @@ reg3N = \vesi,veden,vesi
   mkPN n = mkProperName n ** {lock_PN = <>} ;
 
   mkA = \x -> noun2adj x ** {lock_A = <>} ;
-  mkA2 = \x,c -> x ** {c = CCase c ; lock_A2 = <>} ;
+  mkA2 = \x,c -> x ** {s3 = c.s3 ; p = c.p ; c = c.c ; lock_A2 = <>} ;
   mkADeg x kivempi kivin = 
     let
       a = last (x.s ! ((NCase Sg Part))) ; ---- gives "kivinta"
diff --git a/lib/resource/finnish/SyntaxFin.gf b/lib/resource/finnish/SyntaxFin.gf
index 9dd8e4d37..afe016ac9 100644
--- a/lib/resource/finnish/SyntaxFin.gf
+++ b/lib/resource/finnish/SyntaxFin.gf
@@ -366,23 +366,23 @@ oper
 -- The order of the adjective and its argument depends on the case: the local
 -- cases favour Adj + Noun in the predicative position ("hyvä painissa",
 -- "tyytyväinen vaalitulokseen", "jaollinen kolmella"), which is not a possible
--- order for the accusative case.
+-- order for the accusative case. A preposition seems not to seem affect
+-- the rule: ("yhtäsuuri kuin sinä", "sinua vastaan suunnattu").
 
-  AdjCompl = Adjective ** {c : ComplCase} ;
 
---- Only the middle argument of $complCase$ matters, since
---- no accusatives come into question.
+  AdjCompl = Adjective ** {s3 : Str ; p : Bool ; c : ComplCase} ;
 
   complAdj : AdjCompl -> NounPhrase -> AdjPhrase = \hyva,paini ->
     let
       hyvat : AForm => Str = \\a => hyva.s ! a ;
       c : NPForm = complCase True hyva.c (SVI VIInf3Iness) ;
-      painissa : Str = paini.s ! c
+      painissa : Str = pPosit hyva.s3 hyva.p (paini.s ! c) ;
+      haspp : Bool = notB (isNil hyva.s3)
     in
     {s = table {
            AAttr => \\a => painissa ++ hyvat ! a ; 
            APred => \\a => if_then_else Str 
-                               (isLocalNPForm c)
+                               (orB (isLocalNPForm c) haspp)
                                (hyvat ! a ++ painissa)
                                (painissa ++ hyvat ! a)
            }
diff --git a/lib/resource/scandinavian/SyntaxScand.gf b/lib/resource/scandinavian/SyntaxScand.gf
index 5619fa396..fb0a8c826 100644
--- a/lib/resource/scandinavian/SyntaxScand.gf
+++ b/lib/resource/scandinavian/SyntaxScand.gf
@@ -374,7 +374,7 @@ oper
 
   superlAdjPhrase : AdjDegr -> AdjPhrase = \ung ->
     {s = \\a,c => ung.s ! AF (Super SupWeak) c ;
-     p = True
+     p = False
     } ;
 
 {-