fixes in Attempto

10 files changed, 48 insertions, 33 deletions

diff --git a/examples/attempto/AttemptoI.gf b/examples/attempto/AttemptoI.gf
index 240cbf969..48b8b1a5d 100644
--- a/examples/attempto/AttemptoI.gf
+++ b/examples/attempto/AttemptoI.gf
@@ -211,9 +211,6 @@ lin for_allMassS cn =
 
 lin if_thenS = mkS if_then_Conj ;
 
-
-oper adj_thatCl : A -> S -> Cl = \a,s -> mkCl (mkVP (mkAP (mkAP a) s)) ;
-
 lin falseS s = mkS (adj_thatCl false_A s) ;
 lin not_provableS s = mkS negativePol (adj_thatCl provable_A s) ;
 lin possibleS s = mkS (adj_thatCl possible_A s) ;
diff --git a/examples/attempto/LexAttempto.gf b/examples/attempto/LexAttempto.gf
index 11f7fa237..bba76715b 100644
--- a/examples/attempto/LexAttempto.gf
+++ b/examples/attempto/LexAttempto.gf
@@ -25,4 +25,7 @@ oper
   whose_IDet : IDet ;
 
   eachOf : NP -> NP ;
+
+  adj_thatCl : A -> S -> Cl ;
+
 }
diff --git a/examples/attempto/LexAttemptoEng.gf b/examples/attempto/LexAttemptoEng.gf
index ed61b66d9..a81d58963 100644
--- a/examples/attempto/LexAttemptoEng.gf
+++ b/examples/attempto/LexAttemptoEng.gf
@@ -33,4 +33,6 @@ oper
 
   eachOf np = mkNP (mkNP each_Det) (SyntaxEng.mkAdv part_Prep np) ;
 
+  adj_thatCl : A -> S -> Cl = \a,s -> mkCl (mkVP (mkAP (mkAP a) s)) ;
+
 }
diff --git a/examples/attempto/LexAttemptoFin.gf b/examples/attempto/LexAttemptoFin.gf
index 209c80832..e89fec70c 100644
--- a/examples/attempto/LexAttemptoFin.gf
+++ b/examples/attempto/LexAttemptoFin.gf
@@ -4,17 +4,19 @@ instance LexAttemptoFin of LexAttempto =
    SyntaxFin, 
    ParadigmsFin, 
    ConstructX, 
-   (M = MakeStructuralFin)
+   (M = MakeStructuralFin),
+   (E = ExtraFin),
+   (L = LangFin)
    in {
 
 oper
   possible_A = mkA "mahdollinen" ;
   necessary_A = mkA "välttämätön" ;
   own_A = mkA "oma" ;
-  have_VV = mkVV (mkV "pitää") ;
+  have_VV = mkVV (caseV genitive (mkV "pitää")) ;
   provably_Adv = mkAdv "todistettavasti" ;
   provable_A = mkA "todistettava" ;
-  false_A = mkA (mkN "epätosi" "epätosia") ;
+  false_A = mkA (mkN "epätosi" "epätoden" "epätosia") ;
   such_A = mkA "sellainen" ;
  
   genitiveNP np = mkNP (GenNP np) ;
@@ -33,4 +35,6 @@ oper
 
   eachOf np = mkNP (mkNP each_Det) (SyntaxFin.mkAdv (casePrep elative) np) ;
 
+  adj_thatCl : A -> S -> Cl = \a,s -> 
+    mkCl (L.UseComp (E.CompPartAP (mkAP (mkAP a) s))) ;
 }
diff --git a/examples/attempto/LexAttemptoFre.gf b/examples/attempto/LexAttemptoFre.gf
index 618f37175..b53017388 100644
--- a/examples/attempto/LexAttemptoFre.gf
+++ b/examples/attempto/LexAttemptoFre.gf
@@ -27,4 +27,6 @@ oper
 
   eachOf np = mkNP (mkPredet "chacun" "chacune" genitive P.True) np ;
 
+  adj_thatCl : A -> S -> Cl = \a,s -> mkCl (mkVP (mkAP (mkAP a) s)) ;
+
 }
diff --git a/examples/attempto/LexAttemptoGer.gf b/examples/attempto/LexAttemptoGer.gf
index 58de8a565..308fbfad6 100644
--- a/examples/attempto/LexAttemptoGer.gf
+++ b/examples/attempto/LexAttemptoGer.gf
@@ -27,4 +27,6 @@ oper
 
   eachOf np = mkNP (mkNP each_Det) (SyntaxGer.mkAdv part_Prep np) ;  ---- gen agr
 
+  adj_thatCl : A -> S -> Cl = \a,s -> mkCl (mkVP (mkAP (mkAP a) s)) ;
+
 }
diff --git a/examples/attempto/LexAttemptoIta.gf b/examples/attempto/LexAttemptoIta.gf
index de18a3ec2..191d303ab 100644
--- a/examples/attempto/LexAttemptoIta.gf
+++ b/examples/attempto/LexAttemptoIta.gf
@@ -26,4 +26,7 @@ oper
   whose_IDet = mkIDet (mkIQuant "de chi") ; ----
 
   eachOf np = mkNP (mkPredet "ciascuno" "ciascuna" genitive P.True) np ;
+
+  adj_thatCl : A -> S -> Cl = \a,s -> mkCl (mkVP (mkAP (mkAP a) s)) ;
+
 }
diff --git a/examples/attempto/LexAttemptoSwe.gf b/examples/attempto/LexAttemptoSwe.gf
index 8f71e2b15..d8ca8cf0a 100644
--- a/examples/attempto/LexAttemptoSwe.gf
+++ b/examples/attempto/LexAttemptoSwe.gf
@@ -25,4 +25,6 @@ oper
 
   eachOf np = mkNP (mkNP each_Det) (SyntaxSwe.mkAdv part_Prep np) ; ---- gen agr
 
+  adj_thatCl : A -> S -> Cl = \a,s -> mkCl (mkVP (mkAP (mkAP a) s)) ;
+
 }
diff --git a/examples/attempto/TestAttemptoFin.gf b/examples/attempto/TestAttemptoFin.gf
index bb87f7a7b..ba6caf86b 100644
--- a/examples/attempto/TestAttemptoFin.gf
+++ b/examples/attempto/TestAttemptoFin.gf
@@ -4,7 +4,7 @@ concrete TestAttemptoFin of TestAttempto = AttemptoFin **
   open SyntaxFin, ParadigmsFin, (C = ConstructX) in {
 
 lin card_N = mkkN "kortti" ;
-lin water_MCN = mkCN (mkN "vesi" "vesiä") ;
+lin water_MCN = mkCN (mkN "vesi" "veden" "vesiä") ;
 lin john_PN = mkPN "John" ;
 lin apple_N = mkkN "omena" ;
 lin sleep_V = mkV "nukkua" ;
@@ -18,7 +18,7 @@ lin give_V3 = dirV3 (mkV "antaa") allative ;
 lin tired_A = mkA "väsynyt" ;
 lin rich_A = mkA "rikas" ;
 lin customer_N = mkkN "asiakas" ;
-lin enter_V2 = mkV2 (mkV "astua") illative ; ----
+lin enter_V2 = mkV2 (mkV "astua") illative ; ---- astua sisään
 lin bank_N = mkkN "pankki" ;
 lin satisfied_A = mkA "tyytyväinen" ;
 lin lucky_A = mkA "onnekas" ;
@@ -30,8 +30,8 @@ lin form_N = mkkN "kaavake" ;
 lin age_N = mkkN "ikä" ;
 lin teacher_N = mkkN "opettaja" ;
 lin successful_A = mkA "menestyksekäs" ;
-lin fond_A2 = mkA2 (mkA "kiintynyt") (casePrep illative) ; ----
-lin garden_N = mkkN "puutarha" ; ----
+lin fond_A2 = mkA2 (mkA "kiintynyt") (casePrep illative) ;
+lin garden_N = mkCN (mkN "puu" (mkN "tarha")) ;
 lin morning_N = mkkN "aamu" ;
 lin code_N = mkkN "koodi" ;
 lin drinkable_A = mkA "juotava" ;
@@ -40,21 +40,21 @@ lin admitted_A = mkA "hyväksytty" ;
 lin eat_V2 = mkV2 (mkV "syödä") partitive ;
 lin burger_N = mkkN "hampurilainen" ;
 lin earn_V2 = mkV2 "ansaita" ;
-lin income_N = mkkN "tulo" ; ----
+lin income_N = mkkN "tulo" ; ---- tulot
 lin england_PN = mkPN "Englanti" ;
 lin beginning_N = mkkN "alku" ;
 lin office_N = mkkN "toimisto" ;
-lin interested_A2 = mkA2 (mkA "kiinnostunut") (casePrep elative) ; ----
+lin interested_A2 = mkA2 (mkA "kiinnostunut") (casePrep elative) ;
 lin classroom_N = mkkN "luokkahuone" ;
 lin manually_Adv = mkAdv "käsin" ;
 lin slot_N = mkkN "aukko" ;
 lin patiently_Adv = mkAdv "kärsivällisesti" ;
 lin course_N = mkkN "kurssi" ;
 lin carefully_Adv = mkAdv "huolellisesti" ;
-lin time_N = mkkN "aika" ;
+lin time_N = mkCN (mkN "aika" "ajan" "aikoja") ;
 lin believe_VS = mkVS (mkV "uskoa") ;
 lin seriously_Adv = mkAdv "vakavasti" ;
-lin clerk_N = mkkN "virkailija" ;
+lin clerk_N = mkCN (mkN "virkailija" "virkailijoita") ;
 lin screen_N = mkkN "kuvaruutu" ;
 lin blink_V = mkV "vilkkua" ;
 lin bed_N = mkkN "sänky" ;
@@ -62,15 +62,15 @@ lin container_N = mkkN "astia" ;
 lin automated_teller_N = mkkN "pankkiautomaatti" ;
 lin reject_V2 = mkV2 "hylätä" ;
 lin accept_V2 = mkV2 "hyväksyä" ;
-lin type_V2 = mkV2 "kirjoittaa" ; ----
+lin type_V2 = mkV2 "konekirjoittaa" ; ---- kirjoittaa koneella
 lin know_VS = mkVS (mkV "tietää") ;
 lin manager_N = mkkN "johtaja" ;
-lin oversleep_V = mkV "nukkua" ; ----
+lin oversleep_V = mkV "nukkua" ; ---- nukkua pommiin
 lin valid_A = mkA "pätevä" ;
 lin see_V2 = mkV2 (mkV "nähdä") ;
 lin bark_V = mkV "haukkua" ;
 lin go_V2 = mkV2 (mkV "mennä") illative ;
-lin brother_N = mkkN "veli" ;
+lin brother_N = mkCN (mkN "veli" "veljen" "veljiä") ;
 lin mary_PN = mkPN "Mary" ; ----
 lin machine_N = mkkN "kone" ;
 lin correct_A = mkA "oikea" ;
diff --git a/examples/attempto/TestAttemptoIta.gf b/examples/attempto/TestAttemptoIta.gf
index c1c275255..bdbabe737 100644
--- a/examples/attempto/TestAttemptoIta.gf
+++ b/examples/attempto/TestAttemptoIta.gf
@@ -11,7 +11,7 @@ lin sleep_V = mkV "dormire" ;
 lin young_A = mkA "giovane" ;
 lin dog_N = mkkN "cane" ;
 lin animal_N = mkkN "animale" ;
-lin wait_V = mkV "aspattare" ;
+lin wait_V = mkV "aspettare" ;
 lin man_N = mkCN (mkN "uomo" "uomini" masculine) ;
 lin woman_N = mkkN "donna" ;
 lin give_V3 = mkV3 (mkV "dare") accusative dative ;
@@ -26,49 +26,49 @@ lin well_known_A = mkA "conosciuto" ;
 lin important_A = mkA "importante" ;
 lin expensive_A = mkA "caro" ;
 lin fill_in_V2 = mkV2 "riempire" ; ----
-lin form_N = mkgN "formulario" masculine ; ----
+lin form_N = mkkN "modulo" ;
 lin age_N = mkgN "età" feminine ;
 lin teacher_N = mkkN "professore" ;
 lin successful_A = mkA "riuscito" ;
-lin fond_A2 = mkA2 (mkA "attaccato") dative ; ----
+lin fond_A2 = mkA2 (mkA "affezionato") dative ;
 lin garden_N = mkkN "giardino" ;
 lin morning_N = mkkN "mattino" ;
-lin code_N = mkgN "code" masculine ; ----
+lin code_N = mkgN "codice" masculine ;
 lin drinkable_A = mkA "potabile" ;
 lin work_V = mkV "lavorare" ;
 lin admitted_A = mkA "ammesso" ;
 lin eat_V2 = mkV2 "mangiare" ;
 lin burger_N = mkkN "hamburger" ;
-lin earn_V2 = mkV2 "guadagnare" ; ----
-lin income_N = mkkN "revenuta" ; ----
+lin earn_V2 = mkV2 "guadagnare" ;
+lin income_N = mkkN "reddito" ;
 lin england_PN = mkPN "Inghilterra" ;
 lin beginning_N = mkkN "inizio" ;
 lin office_N = mkkN "ufficio" ;
 lin interested_A2 = mkA2 (mkA "interessato") (mkPrep "per") ;
 lin classroom_N = mkgN "classe" feminine ;
 lin manually_Adv = mkAdv "manualmente" ;
-lin slot_N = mkkN "troco" ; ----
-lin patiently_Adv = mkAdv "pazientemente" ; ----
+lin slot_N = mkkN "slot" ;
+lin patiently_Adv = mkAdv "pazientemente" ;
 lin course_N = mkkN "corso" ;
-lin carefully_Adv = mkAdv "piano" ; ----
+lin carefully_Adv = mkAdv "attentamente" ;
 lin time_N = mkkN "tempo" ;
 lin believe_VS = mkVS (mkV "credere") ; ----
 lin seriously_Adv = mkAdv "seriosamente" ;
-lin clerk_N = mkkN "clerico" ; ----
-lin screen_N = mkkN "screen" ; ----
-lin blink_V = mkV "clignotare" ; ----
+lin clerk_N = mkkN "impiegato" ;
+lin screen_N = mkkN "schermo" ;
+lin blink_V = mkV "lampeggiare" ; 
 lin bed_N = mkkN "letto" ;
 lin container_N = mkkN "recipiente" ;
-lin automated_teller_N = mkgN "automa" masculine ; ----
-lin reject_V2 = mkV2 "rigettare" ; ----
+lin automated_teller_N = mkgN "bancomat" masculine ;
+lin reject_V2 = mkV2 "rifiutare" ;
 lin accept_V2 = mkV2 "accettare" ;
-lin type_V2 = mkV2 "stampare" ; ----
+lin type_V2 = mkV2 "digitare" ;
 lin know_VS = mkVS (mkV "sapere") ; ----
 lin manager_N = mkkN "direttore" ;
 lin oversleep_V = mkV "dormire" ; ----
 lin valid_A = mkA "valido" ;
 lin see_V2 = mkV2 (mkV "vedere") ; ----
-lin bark_V = mkV "aboiare" ; ----
+lin bark_V = mkV "abbaiare" ;
 lin go_V2 = mkV2 (mkV "viaggiare") dative ; ----
 lin brother_N = mkgN "fratello" masculine ;
 lin mary_PN = mkPN "Mary" ;