diff --git a/lib/src/abstract/Construction.gf b/lib/src/abstract/Construction.gf index d2aacc4fb..82abf8ab3 100644 --- a/lib/src/abstract/Construction.gf +++ b/lib/src/abstract/Construction.gf @@ -17,6 +17,7 @@ flags coding=utf8 ; fun hungry_VP : VP ; -- x is hungry / x a faim (Fre) thirsty_VP : VP ; -- x is thirsty / x a soif (Fre) + tired_VP : VP ; -- x is tired / x estoy cansado (Spa) has_age_VP : Card -> VP ; -- x is y years old / x a y ans (Fre) have_name_Cl : NP -> NP -> Cl ; -- x's name is y / x s'appelle y (Fre) diff --git a/lib/src/bulgarian/ConstructionBul.gf b/lib/src/bulgarian/ConstructionBul.gf index e322ecd62..8e7325353 100644 --- a/lib/src/bulgarian/ConstructionBul.gf +++ b/lib/src/bulgarian/ConstructionBul.gf @@ -14,6 +14,8 @@ lincat lin hungry_VP = mkVP (mkA079 "гладен") ; thirsty_VP = mkVP (mkA079 "жаден") ; + tired_VP = mkVP (mkA076 "уморен") ; + has_age_VP card = mkVP (SyntaxBul.mkAdv (mkPrep "на" R.Acc) (mkNP (mkN041 "година"))) ; have_name_Cl x name = mkCl (dirV2 (medialV (actionV (mkV186 "казвам") (mkV156 "кажа")) R.Acc)) ; how_old_QCl p = mkQCl (MorphoFunsBul.mkIAdv "на колко") (mkCl (mkNP a_Quant plNum (mkN041 "година"))) ; diff --git a/lib/src/catalan/ConstructionCat.gf b/lib/src/catalan/ConstructionCat.gf index 7d8560f65..df71c973e 100644 --- a/lib/src/catalan/ConstructionCat.gf +++ b/lib/src/catalan/ConstructionCat.gf @@ -1,7 +1,7 @@ --# -path=alltenses:.:../abstract concrete ConstructionCat of Construction = CatCat ** - open SyntaxCat, SymbolicCat, ParadigmsCat, + open SyntaxCat, SymbolicCat, ParadigmsCat, BeschCat, (L = LexiconCat), (E = ExtraCat), (I = IrregCat), (R = ResCat), (C = CommonRomance), Prelude in { flags coding=utf8 ; @@ -10,6 +10,7 @@ flags coding=utf8 ; lin hungry_VP = E.ComplCN have_V2 (mkCN (mkN "gana" feminine)) ; -- "fam" (val) thirsty_VP = E.ComplCN have_V2 (mkCN (mkN "set" feminine)) ; + tired_VP = mkVP stateCopula (mkAP (mkA "cansat")) ; has_age_VP card = mkVP have_V2 (mkNP L.year_N) ; @@ -55,6 +56,7 @@ lincat Year = NP ; oper noPrep : Prep = mkPrep [] ; + stateCopula = mkVA (mkV (estar_54 "estar")) ; lin weekdayPunctualAdv w = lin Adv {s = w.s ! C.Sg} ; -- lundi diff --git a/lib/src/chinese/ConstructionChi.gf b/lib/src/chinese/ConstructionChi.gf index db111007c..9b3ec8eb3 100644 --- a/lib/src/chinese/ConstructionChi.gf +++ b/lib/src/chinese/ConstructionChi.gf @@ -8,6 +8,8 @@ flags coding=utf8 ; lin hungry_VP = mkVP (mkV "饿") ; thirsty_VP = mkVP (mkA "渴") ; + tired_VP = mkVP (mkV "累了") ; + has_age_VP card = mkVP (lin AdV card) (mkVP (mkV "岁")) ; have_name_Cl x y = mkCl (lin NP x) (mkV2 (mkV "叫")) (lin NP y) ; diff --git a/lib/src/dutch/ConstructionDut.gf b/lib/src/dutch/ConstructionDut.gf index aef5f467f..e425dd515 100644 --- a/lib/src/dutch/ConstructionDut.gf +++ b/lib/src/dutch/ConstructionDut.gf @@ -8,6 +8,8 @@ concrete ConstructionDut of Construction = CatDut ** lin hungry_VP = mkVP have_V2 (mkNP (mkN "honger")) ; thirsty_VP = mkVP have_V2 (mkNP (mkN "dorst")) ; + tired_VP = mkVP (mkA "moe") ; + has_age_VP card = mkVP (mkNP L.year_N) ; have_name_Cl x y = mkCl (lin NP x) (mkV2 I.heten_V) (lin NP y) ; diff --git a/lib/src/english/ConstructionEng.gf b/lib/src/english/ConstructionEng.gf index f9954ccd5..03fbcb8df 100644 --- a/lib/src/english/ConstructionEng.gf +++ b/lib/src/english/ConstructionEng.gf @@ -7,6 +7,8 @@ concrete ConstructionEng of Construction = CatEng ** lin hungry_VP = mkVP (mkA "hungry") ; thirsty_VP = mkVP (mkA "thirsty") ; + tired_VP = mkVP (mkA "tired") ; + has_age_VP card = mkVP (mkAP (lin AdA (mkUtt (mkNP L.year_N))) L.old_A) ; have_name_Cl x y = mkCl (mkNP (E.GenNP x) L.name_N) (lin NP y) ; diff --git a/lib/src/estonian/ConstructionEst.gf b/lib/src/estonian/ConstructionEst.gf index 71c1fb6a5..f5f129031 100644 --- a/lib/src/estonian/ConstructionEst.gf +++ b/lib/src/estonian/ConstructionEst.gf @@ -7,6 +7,8 @@ flags coding=utf8 ; lin hungry_VP = mkVP have_V2 (lin NP (mkNP (mkPN "kõht tühi"))) ; thirsty_VP = mkVP have_V2 (lin NP (mkNP (ParadigmsEst.mkN "janu"))) ; + tired_VP = mkVP (ParadigmsEst.mkA "väsinud") ; + has_age_VP card = let n_years_AdA : AdA = lin AdA (mkUtt (lin NP (mkNP L.year_N))) in mkVP (mkAP n_years_AdA L.old_A) ; diff --git a/lib/src/finnish/ConstructionFin.gf b/lib/src/finnish/ConstructionFin.gf index 9b4d25606..8bc42ff5e 100644 --- a/lib/src/finnish/ConstructionFin.gf +++ b/lib/src/finnish/ConstructionFin.gf @@ -7,6 +7,8 @@ flags coding=utf8 ; lin hungry_VP = mkVP have_V2 (lin NP (mkNP (ParadigmsFin.mkN "nälkä"))) ; thirsty_VP = mkVP have_V2 (lin NP (mkNP (ParadigmsFin.mkN "jano"))) ; + tired_VP = mkVP (caseV partitive (mkV "väsyttää")) ; + has_age_VP card = mkVP (mkAP (lin AdA (mkUtt (lin NP (mkNP L.year_N)))) L.old_A) ; have_name_Cl x y = mkCl (mkNP (E.GenNP x) L.name_N) (lin NP y) ; diff --git a/lib/src/french/ConstructionFre.gf b/lib/src/french/ConstructionFre.gf index d57174f19..65b8aee21 100644 --- a/lib/src/french/ConstructionFre.gf +++ b/lib/src/french/ConstructionFre.gf @@ -10,6 +10,8 @@ flags coding=utf8 ; lin hungry_VP = E.ComplCN have_V2 (mkCN (mkN "faim")) ; thirsty_VP = E.ComplCN have_V2 (mkCN (mkN "soif")) ; + tired_VP = mkVP (mkA "fatigué") ; + has_age_VP card = mkVP have_V2 (mkNP L.year_N) ; have_name_Cl x y = mkCl x (mkV2 (reflV (mkV "appeler"))) y ; diff --git a/lib/src/german/ConstructionGer.gf b/lib/src/german/ConstructionGer.gf index 732e5a725..2e255fb6f 100644 --- a/lib/src/german/ConstructionGer.gf +++ b/lib/src/german/ConstructionGer.gf @@ -9,6 +9,8 @@ flags coding=utf8 ; lin hungry_VP = mkVP (mkA "hungrig") ; thirsty_VP = mkVP (mkA "durstig") ; + tired_VP = mkVP (mkA "müde") ; + has_age_VP card = mkVP (lin AP (mkAP (lin AdA (mkUtt (mkNP L.year_N))) L.old_A)) ; have_name_Cl x y = mkCl (lin NP x) (mkV2 I.heißen_V) (lin NP y) ; diff --git a/lib/src/italian/ConstructionIta.gf b/lib/src/italian/ConstructionIta.gf index 7c4346c3b..775a95d07 100644 --- a/lib/src/italian/ConstructionIta.gf +++ b/lib/src/italian/ConstructionIta.gf @@ -10,6 +10,8 @@ flags coding=utf8 ; lin hungry_VP = E.ComplCN have_V2 (mkCN (mkN "fame")) ; thirsty_VP = E.ComplCN have_V2 (mkCN (mkN "sete")) ; + tired_VP = mkVP (mkA "stanco") ; + has_age_VP card = mkVP have_V2 (mkNP L.year_N) ; have_name_Cl x y = mkCl x (mkV2 (reflV (mkV "chiamare"))) y ; diff --git a/lib/src/japanese/AllJpn.gf b/lib/src/japanese/AllJpn.gf index 1481f0a5b..65a70fe51 100644 --- a/lib/src/japanese/AllJpn.gf +++ b/lib/src/japanese/AllJpn.gf @@ -1,4 +1,4 @@ ---# -path=.:../abstract:../prelude +--# -path=.:../abstract:../prelude:../api concrete AllJpn of AllJpnAbs = LangJpn, diff --git a/lib/src/japanese/ConstructionJpn.gf b/lib/src/japanese/ConstructionJpn.gf new file mode 100644 index 000000000..8afaaa99d --- /dev/null +++ b/lib/src/japanese/ConstructionJpn.gf @@ -0,0 +1,7 @@ +concrete ConstructionJpn of Construction = CatJpn ** + open SyntaxJpn, ParadigmsJpn in { + +lin + tired_VP = mkVP (mkA "疲れている" "疲れた") ; + +} diff --git a/lib/src/japanese/LangJpn.gf b/lib/src/japanese/LangJpn.gf index 73d4f5145..ccd8f90a2 100644 --- a/lib/src/japanese/LangJpn.gf +++ b/lib/src/japanese/LangJpn.gf @@ -1,8 +1,9 @@ ---# -path=.:../abstract:../common +--# -path=.:../abstract:../common:../api concrete LangJpn of Lang = GrammarJpn, - LexiconJpn + LexiconJpn, + ConstructionJpn ,DocumentationJpn --# notpresent ; diff --git a/lib/src/russian/AllRus.gf b/lib/src/russian/AllRus.gf index 9961da733..e6453b60d 100644 --- a/lib/src/russian/AllRus.gf +++ b/lib/src/russian/AllRus.gf @@ -1,4 +1,4 @@ ---# -path=.:../abstract:../common:../prelude +--# -path=.:../abstract:../common:../prelude:../api concrete AllRus of AllRusAbs = LangRus, diff --git a/lib/src/russian/ConstructionRus.gf b/lib/src/russian/ConstructionRus.gf new file mode 100644 index 000000000..57713c2b4 --- /dev/null +++ b/lib/src/russian/ConstructionRus.gf @@ -0,0 +1,7 @@ +concrete ConstructionRus of Construction = CatRus ** + open SyntaxRus, ParadigmsRus, ResRus in { + +lin + tired_VP = mkVP (mkA "уставший" Rel) ; + +} diff --git a/lib/src/russian/LangRus.gf b/lib/src/russian/LangRus.gf index 2aa05f24a..c7ed2fee0 100644 --- a/lib/src/russian/LangRus.gf +++ b/lib/src/russian/LangRus.gf @@ -3,6 +3,7 @@ concrete LangRus of Lang = GrammarRus, LexiconRus, + ConstructionRus, DocumentationRus ** { diff --git a/lib/src/spanish/ConstructionSpa.gf b/lib/src/spanish/ConstructionSpa.gf index 3201e1347..5c19a122f 100644 --- a/lib/src/spanish/ConstructionSpa.gf +++ b/lib/src/spanish/ConstructionSpa.gf @@ -1,7 +1,7 @@ --# -path=alltenses:.:../abstract concrete ConstructionSpa of Construction = CatSpa ** - open SyntaxSpa, SymbolicSpa, ParadigmsSpa, + open SyntaxSpa, SymbolicSpa, ParadigmsSpa, BeschSpa, (L = LexiconSpa), (E = ExtraSpa), (I = IrregSpa), (R = ResSpa), (C = CommonRomance), Prelude in { flags coding=utf8 ; @@ -10,6 +10,8 @@ flags coding=utf8 ; lin hungry_VP = E.ComplCN have_V2 (mkCN (mkN "hambre" feminine)) ; thirsty_VP = E.ComplCN have_V2 (mkCN (mkN "sed" feminine)) ; + tired_VP = mkVP stateCopula (mkAP (mkA "cansado")) ; + has_age_VP card = mkVP have_V2 (mkNP L.year_N) ; have_name_Cl x y = mkCl x (mkV2 (reflV (mkV "llamar"))) y ; @@ -53,6 +55,7 @@ lincat Year = NP ; oper noPrep : Prep = mkPrep [] ; + stateCopula = mkVA (mkV (estar_2 "estar")) ; lin weekdayPunctualAdv w = lin Adv {s = w.s ! C.Sg} ; -- lundi diff --git a/lib/src/swedish/ConstructionSwe.gf b/lib/src/swedish/ConstructionSwe.gf index db742139c..5aaa0f423 100644 --- a/lib/src/swedish/ConstructionSwe.gf +++ b/lib/src/swedish/ConstructionSwe.gf @@ -8,6 +8,8 @@ flags coding=utf8 ; lin hungry_VP = mkVP (mkA "hungrig") ; thirsty_VP = mkVP (mkA "törstig") ; + tired_VP = mkVP (mkA "trött") ; + has_age_VP card = mkVP (lin AP (mkAP (lin AdA (mkUtt (mkNP L.year_N))) L.old_A)) ; have_name_Cl x y = mkCl (lin NP x) (mkV2 (mkV "heta" "hette" "hetat")) (lin NP y) ; diff --git a/lib/src/thai/ConstructionTha.gf b/lib/src/thai/ConstructionTha.gf index b0cf2e4ee..9b925c686 100644 --- a/lib/src/thai/ConstructionTha.gf +++ b/lib/src/thai/ConstructionTha.gf @@ -8,6 +8,8 @@ flags coding=utf8 ; lin hungry_VP = mkVP (mkA (R.thword "หิว" "ข้าว")) ; thirsty_VP = mkVP (mkA (R.thword "กระ" "หาย" "น้ำ")) ; + tired_VP = mkVP (mkA "เหนื่อย") ; + has_age_VP card = mkVP (mkNP (mkNP card L.year_N) (ParadigmsTha.mkAdv (R.thword "อา" "ยุ"))) ; have_name_Cl x y = mkCl x (mkV2 "ชื่อ") y ; diff --git a/lib/src/translator/TranslateJpn.gf b/lib/src/translator/TranslateJpn.gf index f633260f6..57f260c36 100644 --- a/lib/src/translator/TranslateJpn.gf +++ b/lib/src/translator/TranslateJpn.gf @@ -20,7 +20,7 @@ concrete TranslateJpn of Translate = QuestionJpn, RelativeJpn, IdiomJpn, ----- ConstructionJpn, ---- TODO + ConstructionJpn, DocumentationJpn, ---- TODO ChunkJpn, diff --git a/lib/src/translator/TranslateRus.gf b/lib/src/translator/TranslateRus.gf index 713818f46..63a5232a0 100644 --- a/lib/src/translator/TranslateRus.gf +++ b/lib/src/translator/TranslateRus.gf @@ -20,7 +20,7 @@ concrete TranslateRus of Translate = QuestionRus, RelativeRus, IdiomRus, - --ConstructionRus, + ConstructionRus, DocumentationRus, ChunkRus,