diff --git a/lib/src/abstract/Lexicon.gf b/lib/src/abstract/Lexicon.gf index e91345ddc..9017f2101 100644 --- a/lib/src/abstract/Lexicon.gf +++ b/lib/src/abstract/Lexicon.gf @@ -158,6 +158,7 @@ fun king_N : N ; knee_N : N ; know_V2 : V2 ; + know_VQ : VQ ; know_VS : VS ; lake_N : N ; lamp_N : N ; diff --git a/lib/src/bulgarian/LexiconBul.gf b/lib/src/bulgarian/LexiconBul.gf index 29410b057..a8bb9dcf3 100644 --- a/lib/src/bulgarian/LexiconBul.gf +++ b/lib/src/bulgarian/LexiconBul.gf @@ -113,6 +113,7 @@ lin vtype = VNormal ; lock_V = <> } ; + know_VQ = mkVQ (actionV (mkV188 "ēķąģ") (mkV162 "ēķą’")) ; know_VS = mkVS (actionV (mkV188 "ēķąģ") (mkV162 "ēķą’")) ; lake_N = mkN054 "åēåšī" ; lamp_N = mkN041 "ėąģļą" ; diff --git a/lib/src/catalan/LexiconCat.gf b/lib/src/catalan/LexiconCat.gf index 453c3fd93..4603c308d 100644 --- a/lib/src/catalan/LexiconCat.gf +++ b/lib/src/catalan/LexiconCat.gf @@ -108,6 +108,7 @@ lin iron_N = regMN "ferro" ; king_N = regMN "rei" ; know_V2 = dirV2 saberV ; + know_VQ = mkVQ saberV; know_VS = mkVS saberV; lake_N = regMN "llac" ; lamp_N = regFN "ląmpada" ; diff --git a/lib/src/danish/LexiconDan.gf b/lib/src/danish/LexiconDan.gf index ebe7584c9..a7c49c506 100644 --- a/lib/src/danish/LexiconDan.gf +++ b/lib/src/danish/LexiconDan.gf @@ -104,6 +104,7 @@ lin john_PN = mkPN "John" utrum ; king_N = mk2N "konge" "kongen" ; know_V2 = dirV2 (mkV "kende" "kendte") ; + know_VQ = mkVQ vide_V ; know_VS = mkVS vide_V ; lake_N = mk2N "sų" "sųen" ; lamp_N = mk2N "lampe" "lampen" ; diff --git a/lib/src/dutch/LexiconDut.gf b/lib/src/dutch/LexiconDut.gf index ba72deb84..d63204dda 100644 --- a/lib/src/dutch/LexiconDut.gf +++ b/lib/src/dutch/LexiconDut.gf @@ -39,6 +39,7 @@ lin go_V = zijnV gaan_V ; hope_VS = mkVS (mkV "hopen") ; house_N = mkN "huis" neuter ; + know_VQ = mkVQ weten_V ; know_VS = mkVS weten_V ; married_A2 = mkA2 (mkA "getrouwd") (mkPrep "met") ; mother_N2 = mkN2 (mkN "moeder") ; diff --git a/lib/src/english/LexiconEng.gf b/lib/src/english/LexiconEng.gf index 7bec576b0..3d0147e4b 100644 --- a/lib/src/english/LexiconEng.gf +++ b/lib/src/english/LexiconEng.gf @@ -101,6 +101,7 @@ lin iron_N = regN "iron" ; king_N = mkN masculine (regN "king") ; know_V2 = dirV2 (irregV "know" "knew" "known") ; + know_VQ = mkVQ (irregV "know" "knew" "known") ; know_VS = mkVS (irregV "know" "knew" "known") ; lake_N = regN "lake" ; lamp_N = regN "lamp" ; diff --git a/lib/src/finnish/LexiconFin.gf b/lib/src/finnish/LexiconFin.gf index fd086be88..527925bb1 100644 --- a/lib/src/finnish/LexiconFin.gf +++ b/lib/src/finnish/LexiconFin.gf @@ -105,6 +105,7 @@ lin iron_N = mkN "rauta" ; king_N = mkN "kuningas" ; know_VS = mkVS (mkV "tietää" "tiesi") ; + know_VQ = mkVQ (mkV "tietää" "tiesi") ; know_V2 = mkV2 (mkV "tuntea" "tunsi") ; lake_N = mkN "järvi" "järviä" ; lamp_N = mkN "lamppu" ; diff --git a/lib/src/french/LexiconFre.gf b/lib/src/french/LexiconFre.gf index da0813f0f..20a81d501 100644 --- a/lib/src/french/LexiconFre.gf +++ b/lib/src/french/LexiconFre.gf @@ -103,6 +103,7 @@ lin iron_N = regGenN "fer" masculine ; king_N = regGenN "roi" masculine ; know_V2 = connaītre_V2 ; + know_VQ = mkVQ (lin V savoir_V2) ; know_VS = mkVS (lin V savoir_V2) ; lake_N = regGenN "lac" masculine ; lamp_N = regGenN "lampe" feminine ; diff --git a/lib/src/german/LexiconGer.gf b/lib/src/german/LexiconGer.gf index 1aeda1a17..4468646e6 100644 --- a/lib/src/german/LexiconGer.gf +++ b/lib/src/german/LexiconGer.gf @@ -108,6 +108,7 @@ lin jump_V = seinV (irregV "springen" "springt" "sprang" "spränge" "gesprungen") ; king_N = mkN "König" ; know_V2 = dirV2 (irregV "kennen" "kennt" "kannte" "kännte" "gekannt") ; ---- infl + know_VQ = mkVQ wissen_V ; know_VS = mkVS wissen_V ; lake_N = reg2N "See" "Seen" masculine ; --- infl lamp_N = mkN "Lampe"; diff --git a/lib/src/italian/LexiconIta.gf b/lib/src/italian/LexiconIta.gf index 21d7dcd33..39aa730c6 100644 --- a/lib/src/italian/LexiconIta.gf +++ b/lib/src/italian/LexiconIta.gf @@ -103,6 +103,7 @@ lin john_PN = mkPN "Giovanni" masculine ; king_N = regN "rĆ©" ; know_V2 = dirV2 (verboV (conoscere_37 "conoscere")) ; + know_VQ = mkVQ (verboV (sapere_78 "sapere")) ; know_VS = mkVS (verboV (sapere_78 "sapere")) ; lake_N = regN "lago" ; lamp_N = regN "lampada" ; diff --git a/lib/src/norwegian/LexiconNor.gf b/lib/src/norwegian/LexiconNor.gf index 7a5f6dfd0..622f3f9f0 100644 --- a/lib/src/norwegian/LexiconNor.gf +++ b/lib/src/norwegian/LexiconNor.gf @@ -102,6 +102,7 @@ lin john_PN = mkPN "John" masculine ; king_N = regGenN "konge" masculine ; know_V2 = dirV2 (mkV "kjenne" "kjente") ; + know_VQ = mkVQ IrregNor.vite_V ; know_VS = mkVS IrregNor.vite_V ; lake_N = regGenN "vann" neutrum ; lamp_N = regGenN "lampe" feminine ; diff --git a/lib/src/polish/LexiconPol.gf b/lib/src/polish/LexiconPol.gf index c001b3de6..89c9d8aab 100644 --- a/lib/src/polish/LexiconPol.gf +++ b/lib/src/polish/LexiconPol.gf @@ -273,6 +273,7 @@ lin wonder_VQ = mkItVerb (mkReflVerb (mkV "zastanawiać" conj98 "zastanowić" conj77a)); fear_VS = mkReflVerb (mkMonoVerb "bać" conjbac Imperfective); hope_VS = mkItVerb (mkComplicatedVerb (mkMonoVerb "mieć" conj100 Imperfective) "nadzieję"); + know_VQ = mkMonoVerb "wiedzieć" conj103 Imperfective; know_VS = mkMonoVerb "wiedzieć" conj103 Imperfective; say_VS = mkV "mĆ³wić" conj72 "powiedzieć" conj103; become_VA = (mkReflVerb (mkV "stawać" conj57 "stać" conj3)) ** {c={c=Nom;s="";adv=False}}; diff --git a/lib/src/romance/QuestionRomance.gf b/lib/src/romance/QuestionRomance.gf index 9c1d5fe4b..cbcd2a9aa 100644 --- a/lib/src/romance/QuestionRomance.gf +++ b/lib/src/romance/QuestionRomance.gf @@ -39,7 +39,7 @@ incomplete concrete QuestionRomance of Question = let ord = case q of { QDir => DInv ; - QIndir => DDir + QIndir => DInv } ; cls = cl.s ! ord ! t ! a ! p ! Indic ; why = iadv.s diff --git a/lib/src/romanian/LexiconRon.gf b/lib/src/romanian/LexiconRon.gf index 0c5c791a3..7943c8c63 100644 --- a/lib/src/romanian/LexiconRon.gf +++ b/lib/src/romanian/LexiconRon.gf @@ -102,8 +102,9 @@ important_A = mkA "important" ; industry_N = mkN "industrie" ; iron_N = mkN "fier" masculine ; king_N = mkAnim (mkN "rege" masculine) ; -know_V2 = dirV2 (v_besch122 "şti") ; -know_VS = mkVS (v_besch109 "cunoaşte") ; +know_V2 = dirV2 (v_besch109 "cunoaşte") ; +know_VQ = mkVQ (v_besch122 "şti") ; +know_VS = mkVS (v_besch122 "şti") ; lake_N = mkNR "lac" ; lamp_N = mkN "lampă" "lămpi" ; learn_V2 = dirV2(v_besch45 "Ć®nvăţa") ; diff --git a/lib/src/romanian/QuestionRon.gf b/lib/src/romanian/QuestionRon.gf index b75c56af0..6602a5c7a 100644 --- a/lib/src/romanian/QuestionRon.gf +++ b/lib/src/romanian/QuestionRon.gf @@ -41,7 +41,7 @@ concrete QuestionRon of Question = let ord = case q of { QDir => DInv ; - QIndir => DDir + QIndir => DInv --- DDir } ; cls = cl.s ! ord ! t ! a ! p ! Indic ; why = iadv.s diff --git a/lib/src/spanish/LexiconSpa.gf b/lib/src/spanish/LexiconSpa.gf index d51240c73..d52459783 100644 --- a/lib/src/spanish/LexiconSpa.gf +++ b/lib/src/spanish/LexiconSpa.gf @@ -101,6 +101,7 @@ lin iron_N = regN "fierro" ; king_N = regN "rey" ; know_V2 = mkV2 (verboV (conocer_25 "conocer")) ; + know_VQ = mkVQ (verboV (saber_71 "saber")) ; know_VS = mkVS (verboV (saber_71 "saber")) ; lake_N = regN "lago" ; lamp_N = regN "lįmpara" ; diff --git a/lib/src/swedish/LexiconSwe.gf b/lib/src/swedish/LexiconSwe.gf index 8d4efeea1..9833d5550 100644 --- a/lib/src/swedish/LexiconSwe.gf +++ b/lib/src/swedish/LexiconSwe.gf @@ -102,6 +102,7 @@ lin iron_N = regGenN "järn" neutrum ; king_N = (regGenN "kung" utrum) ; know_V2 = mkV2 (mkV "känner") ; + know_VQ = mkVQ (mkV "veta" "vet" "vet" "visste" "vetat" "visst") ; 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;