From 9a92e04210a4b26e37cbf1a89de87ca99e086db3 Mon Sep 17 00:00:00 2001 From: krasimir Date: Tue, 30 Aug 2016 13:36:18 +0000 Subject: [PATCH] some more words in LexiconSlv and StructuralSlv moved from Anna's grammar --- lib/src/slovenian/CatSlv.gf | 1 + lib/src/slovenian/LexiconSlv.gf | 1 + lib/src/slovenian/ParadigmsSlv.gf | 3 +++ lib/src/slovenian/StructuralSlv.gf | 12 ++++++++++++ 4 files changed, 17 insertions(+) diff --git a/lib/src/slovenian/CatSlv.gf b/lib/src/slovenian/CatSlv.gf index a0a2bab99..566dd98c3 100644 --- a/lib/src/slovenian/CatSlv.gf +++ b/lib/src/slovenian/CatSlv.gf @@ -36,6 +36,7 @@ lincat -- Open lexical classes, e.g. Lexicon V = {s : VForm => Str}; + VS = {s : VForm => Str}; VQ = {s : VForm => Str}; VV = {s : VForm => Str}; V2 = {s : VForm => Str; c2 : Prep}; diff --git a/lib/src/slovenian/LexiconSlv.gf b/lib/src/slovenian/LexiconSlv.gf index 334a88ac0..8c630a185 100644 --- a/lib/src/slovenian/LexiconSlv.gf +++ b/lib/src/slovenian/LexiconSlv.gf @@ -23,6 +23,7 @@ lin green_A = mkA "zelen" "zelenejši" ; good_A = mkA "dober" "boljši" ; house_N = mkN "hiša" ; + know_VS = mkVS (mkV "vedeti" "vedet" "vedel" "vedela" "vedeli" "vedela" "vedeli" "vedele" "vedelo" "vedeli" "vedela" "vem" "veš" "ve" "veva" "vesta" "vesta" "vemo" "veste" "vedo" "vediva" "vedimo" "vedi" "vedita" "vedite") ; love_V2 = mkV2 (mkV "ljubiti" "ljubi") ; man_N = mkN "fant" animate ; name_N = mkN "ime" "imena" neuter ; diff --git a/lib/src/slovenian/ParadigmsSlv.gf b/lib/src/slovenian/ParadigmsSlv.gf index 39d23b3b4..0796f7c64 100644 --- a/lib/src/slovenian/ParadigmsSlv.gf +++ b/lib/src/slovenian/ParadigmsSlv.gf @@ -229,6 +229,9 @@ oper mkV2 : V -> Prep -> V2 = \v,p -> lin V2 (v ** {c2 = p}) ; } ; + mkVS : V -> VS ; + mkVS v = lin VS v ; + mkVQ : V -> VQ ; mkVQ v = lin VQ v ; diff --git a/lib/src/slovenian/StructuralSlv.gf b/lib/src/slovenian/StructuralSlv.gf index bb2c9c095..6f67c99f5 100644 --- a/lib/src/slovenian/StructuralSlv.gf +++ b/lib/src/slovenian/StructuralSlv.gf @@ -1,7 +1,10 @@ concrete StructuralSlv of Structural = CatSlv ** open ResSlv, ParadigmsSlv in { lin + although_Subj = {s="čeprav"} ; and_Conj = mkConj "in" Pl ; + because_Subj = {s="zato ket"} ; + can_VV = {s = \\vform => case vform of {_ => "lahko"} }; he_Pron = mkPron "òn" "njêga" "njêga" "njêmu" "njêm" "njím" "njegôv" "njegôvega" "njegôvemu" ("njegôv"|"njegôvega") "njegôvem" "njegôvim" "njegôva" "njegôvih" "njegôvima" "njegôva" "njegôvih" "njegôvima" @@ -12,6 +15,7 @@ lin "njegôve" "njegôvega" "njegôvemu" "njegôvo" "njegôvem" "njegôvim" "njegôvi" "njegôvih" "njegôvima" "njegôvi" "njegôvih" "njegôvima" "njegôva" "njegôvih" "njegôvim" "njegôva" "njegôvih" "njegôvimi" Masc Sg P3 ; + here_Adv = {s="tukaj"} ; i_Pron = mkPron "jàz" "méne" "méne" "méni" "méni" ("menój"|"máno") "mój" "mòjega" "mòjemu" ("mòj"|"mòjega") "mòjem" "mòjim" "mòja" "mòjih" "mòjima" "mòja" "mòjih" "mòjima" @@ -22,6 +26,7 @@ lin "mòje" "mòjega" "mòjemu" "mòjo" "mòjem" "mòjim" "mòji" "mòjih" "mòjima" "mòji" "mòjih" "mòjima" "mòja" "mòjih" "mòjim" "mòja" "mòjih" "mòjimi" Masc Sg P1 ; + in_Prep = mkPrep "v" locative ; it_Pron = mkPron "ôno" "njêga" "njêga" "njêmu" "njêm" "njím" ("njegôv"|"njegòv") "njegôvega" "njegôvemu" ("njegôv"|"njegôvega") "njegôvem" "njegôvim" "njegôva" "njegôvih" "njegôvima" "njegôva" "njegôvih" "njegôvima" @@ -32,6 +37,7 @@ lin "njegôve" "njegôvega" "njegôvemu" "njegôvo" "njegôvem" "njegôvim" "njegôvi" "njegôvih" "njegôvima" "njegôvi" "njegôvih" "njegôvima" "njegôva" "njegôvih" "njegôvim" "njegôva" "njegôvih" "njegôvimi" Neut Sg P3 ; + must_VV = regV "morati" "mora" ; she_Pron = variants {mkPron "ôna" "njó" "njé" "njéj" "njéj" "njó" ; mkPron "ôna" "njó" "njé" "njèj" "njèj" "njó" ; mkPron "ôna" "njó" "njé" "njì" "njì" "njó"} @@ -72,6 +78,7 @@ lin "tȏ" "tȇga" "tȇmu" "tȏ" "tȇm" "tȇm" "tî" "tȇh" "tȇma" "tî" "tȇh" "tȇma" "tȃ" "tȇh" "tȇm" "tȃ" "tȇh" "tȇmi" Def ; + want_VV = regV "želeti" "želi"; we_Pron = mkPron "mí" "nàs" "nàs" "nàm" "nàs" "nàmi" "nàš" "nášega" "nášemu" ("náši"|"nášega") "nášem" "nášim" "náša" "náših" "nášima" "náša" "náših" "nášima" @@ -82,6 +89,11 @@ lin "náše" "nášega" "nášemu" "náše" "nášem" "nášim" "náši" "náših" "nášima" "náši" "náših" "nášima" "náša" "náših" "nášim" "náša" "náših" "nášimi" Masc Pl P1 ; + when_IAdv = {s="kdaj"} ; + when_Subj = {s="medtem ko"} ; + where_IAdv = {s="kje"} ; + why_IAdv = {s="zakaj"} ; + with_Prep = mkPrep "z" instrumental ; youSg_Pron = mkPron "tí" "tébe" "tébe" "tébi" "tébi" ("tebój"|"tábo") "tvój" "tvòjega" "tvòjemu" ("tvòj"|"tvòjega") "tvòjem" "tvòjim" "tvòja" "tvòjih" "tvòjima" "tvòja" "tvòjih" "tvòjima"