distinguished know_VS and know_V2 in Lexicon; patched Italian imperatives (not quite finished yet)

9 files changed, 19 insertions, 14 deletions

diff --git a/next-lib/src/abstract/Lexicon.gf b/next-lib/src/abstract/Lexicon.gf
index 59b844ec9..2d5e533bc 100644
--- a/next-lib/src/abstract/Lexicon.gf
+++ b/next-lib/src/abstract/Lexicon.gf
@@ -163,7 +163,7 @@ fun
   king_N : N ;
   knee_N : N ;
   know_V2 : V2 ;
-  know_V2 : V2 ;
+  know_VS : VS ;
   lake_N : N ;
   lamp_N : N ;
   language_N : N ;
diff --git a/next-lib/src/english/LexiconEng.gf b/next-lib/src/english/LexiconEng.gf
index b37aa997e..92319b8b2 100644
--- a/next-lib/src/english/LexiconEng.gf
+++ b/next-lib/src/english/LexiconEng.gf
@@ -102,6 +102,7 @@ lin
   iron_N = regN "iron" ;
   king_N = mkN masculine (regN "king") ;
   know_V2 = dirV2 (irregV "know" "knew" "known") ;
+  know_VS = mkVS (irregV "know" "knew" "known") ;
   lake_N = regN "lake" ;
   lamp_N = regN "lamp" ;
   learn_V2 = dirV2 (regV "learn") ;
diff --git a/next-lib/src/finnish/LexiconFin.gf b/next-lib/src/finnish/LexiconFin.gf
index 9b9c91a2f..0347ad898 100644
--- a/next-lib/src/finnish/LexiconFin.gf
+++ b/next-lib/src/finnish/LexiconFin.gf
@@ -105,7 +105,8 @@ lin
   industry_N = mkN "teollisuus" ;
   iron_N = mkN "rauta" ;
   king_N = mkN "kuningas" ;
-  know_V2 = mkV2 (mk2V "tietää" "tiesi") ; --- tuntea; gives tietänyt
+  know_VS = mkVS (mkV "tietää" "tiesi") ;
+  know_V2 = mkV2 (mkV "tuntea" "tunsi") ;
   lake_N = mkN "järvi" "järviä" ;
   lamp_N = mkN "lamppu" ;
   learn_V2 = 
@@ -348,7 +349,7 @@ lin
   sew_V = mkV "kylvää" ;
   sing_V = mkV "laulaa" ;
   sit_V = mkV "istua" ;
-  smell_V = mk2V "haistaa" "haistoi" ;
+  smell_V = mk2V "haista" "haisi" ;
   spit_V = mkV "sylkeä" ;
   split_V2 = mkV2 (mk2V "halkaista" "halkaisi") ;
   squeeze_V2 = mkV2 (mkV "puristaa") cpartitive ;
diff --git a/next-lib/src/french/LexiconFre.gf b/next-lib/src/french/LexiconFre.gf
index d7f7baf6f..11dbcb5db 100644
--- a/next-lib/src/french/LexiconFre.gf
+++ b/next-lib/src/french/LexiconFre.gf
@@ -103,7 +103,8 @@ lin
   industry_N = regGenN "industrie" feminine ;
   iron_N = regGenN "fer" masculine ;
   king_N = regGenN "roi" masculine ;
-  know_V2 = connaître_V2 ; ---- savoir_V2 : VS
+  know_V2 = connaître_V2 ; 
+  know_VS = mkVS savoir_V2 ;
   lake_N = regGenN "lac" masculine ;
   lamp_N = regGenN "lampe" feminine ;
   learn_V2 = apprendre_V2 ;
diff --git a/next-lib/src/german/LexiconGer.gf b/next-lib/src/german/LexiconGer.gf
index dd76b9c21..ac8b68973 100644
--- a/next-lib/src/german/LexiconGer.gf
+++ b/next-lib/src/german/LexiconGer.gf
@@ -108,7 +108,8 @@ lin
   iron_N = reg2N "Eisen" "Eisen" neuter ;
   jump_V = seinV (irregV "springen" "springt" "sprang" "spränge" "gesprungen") ;
   king_N = regN "König" ;
-  know_V2 = dirV2 (irregV "wissen" "weiß" "wußte" "wüßte" "gewußt") ; ---- infl
+  know_V2 = dirV2 (irregV "kennen" "kennt" "kannte" "kännte" "gekannt") ; ---- infl
+  know_VS = mkVS (irregV "wissen" "weiß" "wußte" "wüßte" "gewußt") ; ---- infl
   lake_N = reg2N "See" "Seen" masculine ; --- infl
   lamp_N = regN "Lampe";
   learn_V2 = dirV2 (regV "lernen") ;
diff --git a/next-lib/src/italian/DiffIta.gf b/next-lib/src/italian/DiffIta.gf
index a54520fa9..d6ab22238 100644
--- a/next-lib/src/italian/DiffIta.gf
+++ b/next-lib/src/italian/DiffIta.gf
@@ -112,12 +112,11 @@ instance DiffIta of DiffRomance = open CommonRomance, PhonoIta, BeschIta, Prelud
         let 
           pe    = case b of {True => P3 ; _ => p} ;
           agr   = aag ** {p = pe} ;
-          clpr  = <[],[],False> ; ----e pronArg agr.n agr.p vp.clAcc vp.clDat ;
-----e          verb  = case <aag.n, pol,pe> of {
-----e            <Sg,Neg,P2> => (vp.s ! VPInfinit Simul clpr.p3).inf ! aag ;
-----e            _ => (vp.s ! VPImperat).fin ! agr
-----e            } ;
-          verb  = (vp.s ! VPImperat).fin ! agr ; ----e
+          clpr  = <vp.clit1 ++ vp.clit2,[],False> ; ----e pronArg agr.n agr.p vp.clAcc vp.clDat ;
+          verb  = case <aag.n, pol,pe> of {
+            <Sg,Neg,P2> => (vp.s ! VPInfinit Simul clpr.p3).inf ! aag ;
+            _ => (vp.s ! VPImperat).fin ! agr
+            } ;
           neg   = vp.neg ! pol ;
           compl = neg.p2 ++ clpr.p2 ++ vp.comp ! agr ++ vp.ext ! pol
         in
diff --git a/next-lib/src/italian/LexiconIta.gf b/next-lib/src/italian/LexiconIta.gf
index 552c372f2..573c436e6 100644
--- a/next-lib/src/italian/LexiconIta.gf
+++ b/next-lib/src/italian/LexiconIta.gf
@@ -103,7 +103,8 @@ lin
   iron_N = regN "ferro" ;
   john_PN = mkPN "Giovanni" masculine ;
   king_N = regN "ré" ;
-  know_V2 = dirV2 (verboV (conoscere_37 "conoscere")) ; --- savoir_V2 : VS
+  know_V2 = dirV2 (verboV (conoscere_37 "conoscere")) ;
+  know_VS = mkVS (verboV (sapere_78 "sapere")) ;
   lake_N = regN "lago" ;
   lamp_N = regN "lampa" ;
   learn_V2 = dirV2 (regV "imparare") ;
diff --git a/next-lib/src/romance/ResRomance.gf b/next-lib/src/romance/ResRomance.gf
index 4ff8991b8..ea3e215ab 100644
--- a/next-lib/src/romance/ResRomance.gf
+++ b/next-lib/src/romance/ResRomance.gf
@@ -306,7 +306,7 @@ oper
         vp   = useVP vpr ;
 ----e        clpr = pronArg agr.n agr.p vp.clAcc vp.clDat ;
 ----e        iform = infForm agr.n agr.p vp.clAcc vp.clDat ;
-        clpr = <vp.clit1, vp.clit2, False> ; ----e
+        clpr = <vp.clit1,vp.clit2, False> ; ----e
         iform = False ; ----e
         inf  = (vp.s ! VPInfinit Simul iform).inf ! (aagr agr.g agr.n) ;
         neg  = vp.neg ! Pos ; --- Neg not in API
diff --git a/next-lib/src/swedish/LexiconSwe.gf b/next-lib/src/swedish/LexiconSwe.gf
index 3bca3ec0f..724186fce 100644
--- a/next-lib/src/swedish/LexiconSwe.gf
+++ b/next-lib/src/swedish/LexiconSwe.gf
@@ -102,7 +102,8 @@ lin
   industry_N = mk2N "industri" "industrier" ; ---- "ien" ??
   iron_N = regGenN "järn" neutrum ;
   king_N = (regGenN "kung" utrum) ;
-  know_V2 = dirV2 (mkV "veta" "vet" "vet" "visste" "vetat" "visst") ;
+  know_V2 = mkV2 (mkV "känner") ;
+  know_VS = mkVS (mkV "veta" "vet" "vet" "visste" "vetat" "visst") ;
   lake_N = mkN "sjö" "sjön" "sjöar" "sjöarna" ;
   lamp_N = regGenN "lampa" utrum;
   learn_V2 = dirV2 (reflV (mkV "lära" "lär" "lär" "lärde" "lärt" "lärd")) ;