split the two senses of can_VV in Dictionary, as they are split in Structural

This commit is contained in:
aarne
2014-04-01 13:57:42 +00:00
parent fb202420dd
commit cdd7adef64
12 changed files with 28 additions and 21 deletions

View File

@@ -8834,7 +8834,8 @@ fun camshaft_N : N ;
fun camwood_N : N ;
fun can_N : N ;
fun can_V2 : V2 ;
fun can_VV : VV ;
fun can_1_VV : VV ; -- | I can come with you (possibility)
fun can_2_VV : VV ; -- | I can speak English (know-how)
fun canada_PN : PN ;
fun canadian_A : A ;
fun canadian_N : N ;

View File

@@ -1,6 +1,6 @@
--# -path=.:../bulgarian:../abstract:../common
concrete DictionaryBul of Dictionary = CatBul ** open MorphoBul, ResBul, ParadigmsBul, Prelude in {
concrete DictionaryBul of Dictionary = CatBul ** open MorphoBul, ResBul, (S = StructuralBul), ParadigmsBul, Prelude in {
flags
coding=utf8 ;
@@ -8428,7 +8428,8 @@ lin camshaft_N = variants {};
lin camwood_N = variants {};
lin can_N = mkN041 "консерва" ;
lin can_V2 = dirV2 (singleV (mkV186 "консервирам"));
lin can_VV = mkVV (singleV (mkV166 "мога"));
lin can_1_VV = S.can_VV ;
lin can_2_VV = S.can8know_VV ;
lin canada_PN = mkPN "Канада" Fem;
lin canadian_A = mkA078 "канадски" ;
lin canadian_N = mkN008a "канадец";

View File

@@ -34,7 +34,8 @@ lin
by8agent_Prep = S.by8agent_Prep ; --CHECKED
by8means_Prep = S.by8means_Prep ; --CHECKED
can8know_VV = S.can8know_VV ; --CHECKED
can_VV = S.can_VV ; --CHECKED
can_1_VV = S.can_VV ;
can_2_VV = S.can8know_VV ;
during_Prep = S.during_Prep ; --CHECKED
either7or_DConj = S.either7or_DConj ; --CHECKED
every_Det = S.every_Det ; --CHECKED

View File

@@ -8837,7 +8837,8 @@ lin camshaft_N = mkN "camshaft" "camshafts";
lin camwood_N = mkN "camwood" ;
lin can_N = mkN "can" "cans";
lin can_V2 = mkV2 (mkV "can" "cans" "canned" "canned" "canning");
lin can_VV = S.can_VV ;
lin can_1_VV = S.can_VV ;
lin can_2_VV = S.can8know_VV ;
lin canada_PN = mkPN "Canada";
lin canadian_A = compoundA (mkA "Canadian");
lin canadian_N = mkN "Canadian" "Canadians";

View File

@@ -51692,7 +51692,8 @@ zymotic_A = mkWA "tsymoosiin" "liittyvä" ; --UNCHK
by8agent_Prep = S.by8agent_Prep ;
by8means_Prep = S.by8means_Prep ;
can8know_VV = S.can8know_VV ;
can_VV = S.can_VV ;
can_1_VV = S.can_VV ;
can_2_VV = S.can8know_VV ;
during_Prep = S.during_Prep ;
either7or_DConj = S.either7or_DConj ;
every_Det = S.every_Det ;

View File

@@ -33,8 +33,8 @@ lin
but_PConj = S.but_PConj; --CHECKED
by8agent_Prep = S.by8agent_Prep; --CHECKED
by8means_Prep = S.by8means_Prep; --CHECKED
can8know_VV = S.can8know_VV; --CHECKED
can_VV = S.can_VV; --CHECKED
can_1_VV = S.can_VV ;
can_2_VV = S.can8know_VV ;
during_Prep = S.during_Prep; --CHECKED
either7or_DConj = S.either7or_DConj; --CHECKED
every_Det = S.every_Det; --CHECKED

View File

@@ -1,6 +1,7 @@
--# -path=.:../german:../abstract:../common
concrete DictionaryGer of Dictionary = CatGer ** open ParadigmsGer, IrregGer, (R = ResGer), (M = MorphoGer), Prelude in {
concrete DictionaryGer of Dictionary = CatGer ** open ParadigmsGer, (S = StructuralGer),
IrregGer, (R = ResGer), (M = MorphoGer), Prelude in {
flags
coding=utf8 ;
@@ -5112,12 +5113,8 @@ lin campus_N = variants {};
lin camshaft_N = reg2N "Nockenwelle" "Nockenwellen" feminine;
lin can_N = variants {};
lin can_V2 = dirV2 (irregV "dürfen" "dürft" "durfte" "dürfte" "gedurft" );
lin can_VV = R.auxVV
(R.mkV
"können" "kann" "kannst" "kann" "könnt" "könn"
"konnte" "konntest" "konnten" "konntet"
"könnte" "gekonnt" []
R.VHaben) ;
lin can_1_VV = S.can_VV ;
lin can_2_VV = S.can8know_VV ;
lin canada_PN = variants {};
lin canadian_A = variants {};
lin canadian_N = reg2N "Kanadier" "Kanadier" masculine;

View File

@@ -2,7 +2,7 @@
-- Pushpak Bhattacharyya's Hindi WordNet
-- GF version generated by hdict2gf, Shafqat Virk March 2012
--# -path=.:../english:../abstract:../common:../hindustani
concrete DictionaryHin of Dictionary = CatHin ** open ParadigmsHin, Prelude, NounHin,ParamX,CommonHindustani in {
concrete DictionaryHin of Dictionary = CatHin ** open ParadigmsHin, Prelude, (S = StructuralHin), NounHin,ParamX,CommonHindustani in {
flags
coding=utf8 ;
@@ -33645,7 +33645,8 @@ at_Prep = mkPrep "पर" "पर" ;
but_PConj = ss "लेकिन" ;
by8agent_Prep = mkPrep "से" "से" ;
by8means_Prep = mkPrep "पर" "पर" ;
can8know_VV,can_VV = mkV "सकना" ** { isAux = True} ;
can_1_VV = S.can_VV ;
can_2_VV = S.can8know_VV ;
during_Prep = mkPrep ["के दरमियान"] ["के दरमियान"] ;
either7or_DConj = sd2 "कोई एक" "या" ** {n = Sg} ;
everybody_NP = MassNP (UseN (ParadigmsHin.mkN "हर कोई" "हर कोई" "हर कोई" "हर कोई" "हर कोई" "हर कोई" Masc ));

View File

@@ -2268,7 +2268,8 @@ lin camphorated_A = mkA "canforato" ; -- status=guess
lin can8know_VV = S.can8know_VV ; -- comment=CHECKED
lin can_N = mkN "annaffiatoio" ; -- status=guess
lin can_V2 = mkV2 (potere_V) ; -- status=guess, src=wikt
lin can_VV = S.can_VV ; -- comment=CHECKED
lin can_1_VV = S.can_VV ;
lin can_2_VV = S.can8know_VV ;
lin canal_N = mkN "canale" ; -- status=guess
lin canary_A = mkA "canarino" ; -- status=guess
lin canary_N = mkN "canario" | mkN "canarino" | mkN "canarino" ; -- status=guess status=guess status=guess

View File

@@ -3128,7 +3128,8 @@ lin camshaft_N = mkN "árbol de levas" ; -- status=guess
lin can8know_VV = S.can8know_VV ; -- comment=CHECKED
lin can_N = mkN "regadera" ; -- status=guess
lin can_V2 = mkV2 (poder_V) ; -- status=guess, src=wikt
lin can_VV = S.can_VV ; -- comment=CHECKED
lin can_1_VV = S.can_VV ;
lin can_2_VV = S.can8know_VV ;
lin canal_N = mkN "canal" ; -- status=guess
lin canard_N = mkN "bulo" | mkN "filfa" ; -- status=guess status=guess
lin canary_N = mkN "canario" ; -- status=guess

View File

@@ -8726,7 +8726,8 @@ lin camshaft_N = variants {} ;
lin camwood_N = variants {} ;
lin can_N = mkN "dunk" ;
lin can_V2 = dirV2 (mkV "konserverar");
lin can_VV = S.can_VV;
lin can_1_VV = S.can_VV ;
lin can_2_VV = S.can8know_VV ;
lin canada_PN = variants {} ;
lin canadian_A = mkA "kanadensisk" ;
lin canadian_N = mkN "kanadensiska" ;

View File

@@ -7215,7 +7215,8 @@ varied_A
predictable_A
mutation_N
equal_V2
can_VV
can_1_VV
can_2_VV
can_V2
burst_N
retrieve_V2