shall_VV and should_VV in all Dictionary modules, to avoid a common failure ; should be probably in Constructions

This commit is contained in:
aarne
2014-04-29 17:10:58 +00:00
parent e777c4a551
commit 3362818af2
12 changed files with 25 additions and 11 deletions

View File

@@ -273,7 +273,8 @@ mkV2 : overload {
mkV0 : V -> V0 ; --%
mkVS : V -> VS ;
mkV2S : V -> Prep -> V2S ;
mkVV : V -> VV ;
mkVV : V -> VV ; -- with zu
auxVV : V -> VV ; -- without zu
mkV2V : V -> Prep -> V2V ;
mkVA : V -> VA ;
mkV2A : V -> Prep -> V2A ;
@@ -491,6 +492,7 @@ mkV2 : overload {
mkVS v = v ** {lock_VS = <>} ;
mkVQ v = v ** {lock_VQ = <>} ;
mkVV v = v ** {isAux = False ; lock_VV = <>} ;
auxVV v = v ** {isAux = True ; lock_VV = <>} ;
V0 : Type = V ;
-- V2S, V2V, V2Q : Type = V2 ;

View File

@@ -49458,7 +49458,8 @@ lin shot_tower_N = variants {};
lin shotgun_N = mkN038 "пушка";
lin shotton_PN = variants {};
lin shotts_PN = variants {};
lin should_VV = mkVV (singleV (mkV186 "трябвам")) ;
lin shall_VV = mkVV (singleV (mkV186 "трябвам")) ;
lin should_VV = mkVV (singleV (mkV186 "трябвам")) ; ----
lin shoulder_N = mkN059 "рамо";
lin shoulder_V2 = dirV2 (dualV (mkV186 "поемам") (mkV171 "поема")); ----
lin shoulder_blade_N = mkN038 "плешка";

View File

@@ -13490,7 +13490,8 @@ lin shortening_N = mkN "缩短" ;
lin shortfall_N = mkN "差额" ;
lin shorthand_N = mkN "速记法" ;
lin shot_N = mkN "镜头" ;
lin should_VV = mkVV "应该" ;
lin shall_VV = mkVV "应该" ;
lin should_VV = mkVV "应该" ; ----
lin shoulder_N = mkN "肩" ;
lin shoulder_V2 = mkV2 "担负" ;
lin shout_N = mkN "呼喊" ;

View File

@@ -15113,7 +15113,8 @@ lin shortage_N = mkN "krapte" feminine | mkN "tekort" neuter ; -- status=guess s
lin shortly_Adv = variants{} ; --
lin shot_N = mkN "kogel" masculine ; -- status=guess
lin shotgun_N = mkN "hagelgeweer" neuter | mkN "jachtgeweer" neuter | mkN "buks" masculine feminine ; -- status=guess status=guess status=guess
lin should_VV = mkVV (mkV "mochten") ; -- status=guess, src=wikt
lin shall_VV = auxVV R.zullen_V ;
lin should_VV = auxVV R.zullen_V ; ----
lin shoulder_N = mkN "schouderblad" neuter ; -- status=guess
lin shout_N = mkN "schreeuw" masculine ; -- status=guess
lin shout_V = mkV "schreeuwen" ; -- status=guess, src=wikt

View File

@@ -45786,7 +45786,8 @@ lin shot_N = mkN "laukaus" ; ---ARB mkWN (k1A "lähtö") ;
lin shot_put_N = mkWN (compoundN "kuulan" (k1A "työntö")) ; --UNCHK
lin shot_tower_N = mkWN (compoundN "haulinvalu" (k5 "torni")) ; --UNCHK
lin shotgun_N = mkWN (k4A "haulikko") ; --UNCHK
lin should_VV = mkVV (caseV genitive (mkV "pitää")) ; ---ARB pitäisi
lin shall_VV = mkVV (caseV genitive (mkV "pitää")) ;
lin should_VV = mkVV (caseV genitive (mkV "pitää")) ; ----
lin shoulder_N = mkWN (k49A "piennar") ; --UNCHK
lin shoulder_V2 = mkV2 (mkV (mkV "ottaa") "harteille") ;
lin shoulder_blade_N = mkWN (compoundN "lapa" (k18 "luu")) ; --UNCHK

View File

@@ -18148,6 +18148,8 @@ lin shorthand_N = mkN "sténographie" feminine ; -- tocheck
lin shortly_Adv = variants{} ; --
lin shot_N = mkN "poids" masculine | mkN "tir" masculine | mkN "dose" feminine | mkN "coup" masculine | mkN "plomb" masculine | mkN "piqure" feminine ; -- tocheck
lin shotgun_N = mkN "fusil" masculine ; -- tocheck
lin shall_VV = S.must_VV ;
lin should_VV = S.must_VV ; ----
lin shoulder_N = mkN "épaule" feminine ; -- tocheck
lin shout_N = mkN "cri" masculine ; -- tocheck
lin shout_V = variants{}; -- mkV2 (mkV "crier") ; -- tocheck

View File

@@ -34627,7 +34627,8 @@ lin shot_tower_N = variants {};
lin shotgun_N = reg2N "Beifahrersitz" "Beifahrersitze" masculine;
lin shotton_PN = variants {};
lin shotts_PN = variants {};
lin should_VV = variants {};
lin shall_VV = auxVV I.sollen_V ;
lin should_VV = auxVV I.sollen_V ; ----
lin shoulder_N = reg2N "Schulter" "Schultern" feminine;
lin shoulder_V2 = variants {};
lin shoulder_blade_N = variants {};

View File

@@ -24873,7 +24873,8 @@ lin shortlist_V2 = mkV2 (compoundV "संक्षिप्त सूची म
lin shot_N = mkN "छर्रा" ; -- tocheck
lin shot_put_N = mkN "गोला फेंक" ; -- tocheck
lin shotgun_N = mkN "बन्दूक" ; -- tocheck
lin should_VV= mkV "चाहियेना" ** { isAux = True} ;
lin shall_VV= mkV "चाहियेना" ** { isAux = True} ;
lin should_VV= mkV "चाहियेना" ** { isAux = True} ; ----
lin shoulder_N = mkN "बोतल" ; -- tocheck
lin shoulder_V2 = mkV2 (compoundV "आगे" (mkV "बढना")) ; -- tocheck
lin shout_N = mkN "चीत्कार" ; -- tocheck

View File

@@ -15317,6 +15317,8 @@ lin shortcut_N = mkN "scorciatoia" ; -- status=guess
lin shorthand_N = mkN "stenografia" ; -- status=guess
lin shortly_Adv = variants{} ; --
lin shot_N = mkN "tiro" ; -- status=guess
lin shall_VV = S.must_VV ;
lin should_VV = S.must_VV ; ----
lin shoulder_N = mkN "spalla" ; -- status=guess
lin shout_N = mkN "grido" ; -- status=guess
lin shout_V = mkV "offrire" ; -- status=guess, src=wikt

View File

@@ -13493,7 +13493,7 @@ lin musketeer_N = mkN "mosquetero" ; -- status=guess
lin muskrat_N = mkN "rata almizclera" ; -- status=guess
lin mussel_N = mkN "mejillón" masculine ; -- status=guess
lin must_N = mkN "mosto" ; -- status=guess
lin must_VV = S.must_VV ; -- comment=CHECKED
lin must_VV = S.must_VV ;
lin mustard_N = mkN "mostaza" ; -- status=guess
lin musty_A = mkA "mohoso" ; -- status=guess
lin mutability_N = mkN "mutabilidad" feminine ; -- status=guess
@@ -18432,6 +18432,8 @@ lin shorthand_N = mkN "taquigrafía" ; -- status=guess
lin shortly_Adv = variants{} ; --
lin shot_N = mkN "chupito" ;
lin shotgun_N = mkN "escopeta" ; -- status=guess
lin shall_VV = S.must_VV ;
lin should_VV = S.must_VV ; ----
lin shoulder_N = mkN "omóplato" | mkN "escápula" ;
lin shout_N = mkN "grito" ;
lin shout_V = mkV "gritar" ;

View File

@@ -8615,7 +8615,7 @@ lin calk_N = mkN "driva" ;
lin calk_V2 = variants {} ;
lin call_N = mkN "anrop" "anrop" | mkN "kallelse" "kallelser" | mkN "telefonsamtal" neutrum ; --- split -- | function call -- | phone call
lin call_V = mkV "kalla" | mkV "anropa" ;
lin call_V2 = mkV2 "kalla" | mkV2 "anropa" ;
lin call_V2 = mkV2 "kalla" | mkV2 "anropa" | mkV2 I.heta_V ; ---- heta = be called
lin call_V2A = mkV2A (mkV "kallar") ;
lin call_V2V = mkV2V (mkV "kalla") ;
lin call_V3 = mkV3 "kalla" ;
@@ -51569,6 +51569,7 @@ lin shaky_A = mkA "skakig" ; -- comment=12
lin shale_N = mkN "skiffer" ;
lin shale_oil_N = variants {} ;
lin shall_VV = auxVV (mkV "skola" ("skall" | "ska") "skola" "skulle" "skolat" "skolande" | mkV "böra" "borde" "bort");
lin should_VV = auxVV (mkV "skola" ("skall" | "ska") "skola" "skulle" "skolat" "skolande" | mkV "böra" "borde" "bort"); ----
lin shallot_N = mkN "schalottenlök" ; -- status=guess
lin shallow_A = mkA "grund" | mkA "ytlig" ; -- SaldoWN -- comment=3
lin shallow_N = mkN "grund" "grunder" | mkN "grund" neutrum ; -- SaldoWN = mkN "grund" neutrum ; -- comment=2
@@ -52007,7 +52008,6 @@ lin shot_tower_N = variants {} ;
lin shotgun_N = mkN "hagelgevär" neutrum;
lin shotton_PN = variants {} ;
lin shotts_PN = variants {} ;
lin should_VV = auxVV (mkV "skola" ("ska" | "skall") "skola" "skulle" "skolat" "skolande" | mkV "böra" "borde" "bort");
lin shoulder_N = mkN "skulder" "skulder" ;
lin shoulder_V2 = dirV2 (partV (mkV "knuffar")"ut");
lin shoulder_blade_N = variants {} ;

View File

@@ -265,7 +265,7 @@ lin try_V = mkV "försöker" ;
lin call_V3 = mkV3 "kalla" ;
lin call_V2V = mkV2V (mkV "kalla") ;
lin call_V2A = mkV2A (mkV "kallar") ;
lin call_V2 = mkV2 "kalla" | mkV2 "anropa" ;
lin call_V2 = mkV2 "kalla" | mkV2 "anropa" | mkV2 I.heta_V ; ---- heta = be called
lin call_V = mkV "kalla" | mkV "anropa" ;
lin hand_N = L.hand_N ;
lin party_N = mkN "parti" "partit" "partier" "partierna" | mkN "grupp" "grupper" ; ---