From eb2f006cf5d28dd993c2805fc149847386e5e9c5 Mon Sep 17 00:00:00 2001 From: aarne Date: Wed, 11 Dec 2013 13:10:21 +0000 Subject: [PATCH] weekdays in Swe ; adverbs for next and last weekday --- lib/src/abstract/Construction.gf | 3 +++ lib/src/english/ConstructionEng.gf | 2 ++ lib/src/finnish/ConstructionFin.gf | 2 ++ lib/src/swedish/AllSwe.gf | 1 + lib/src/swedish/AllSweAbs.gf | 1 + lib/src/swedish/ConstructionSwe.gf | 17 +++++++++++++++++ 6 files changed, 26 insertions(+) diff --git a/lib/src/abstract/Construction.gf b/lib/src/abstract/Construction.gf index db1a291e2..f26554a79 100644 --- a/lib/src/abstract/Construction.gf +++ b/lib/src/abstract/Construction.gf @@ -42,6 +42,9 @@ fun -- monthN : Month -> N --months are already as nouns in Dict weekdayPunctualAdv : Weekday -> Adv ; weekdayHabitualAdv : Weekday -> Adv ; + weekdayLastAdv : Weekday -> Adv ; + weekdayNextAdv : Weekday -> Adv ; + monthAdv : Month -> Adv ; monday_Weekday, tuesday_Weekday, wednesday_Weekday, thursday_Weekday, friday_Weekday, sunday_Weekday : Weekday ; diff --git a/lib/src/english/ConstructionEng.gf b/lib/src/english/ConstructionEng.gf index e1b7c3328..46f7b4bdf 100644 --- a/lib/src/english/ConstructionEng.gf +++ b/lib/src/english/ConstructionEng.gf @@ -37,6 +37,8 @@ lin weekdayPunctualAdv w = SyntaxEng.mkAdv on_Prep (mkNP w) ; -- on Sunday weekdayHabitualAdv w = SyntaxEng.mkAdv on_Prep (mkNP aPl_Det w) ; -- on Sundays + weekdayNextAdv w = SyntaxEng.mkAdv (mkPrep "next") (mkNP w) ; -- next Sunday + weekdayLastAdv w = SyntaxEng.mkAdv (mkPrep "last") (mkNP w) ; -- last Sunday } diff --git a/lib/src/finnish/ConstructionFin.gf b/lib/src/finnish/ConstructionFin.gf index b061437f7..653b2d80b 100644 --- a/lib/src/finnish/ConstructionFin.gf +++ b/lib/src/finnish/ConstructionFin.gf @@ -36,6 +36,8 @@ lin weekdayPunctualAdv w = w.point ; weekdayHabitualAdv w = w.habitual ; + weekdayLastAdv w = ParadigmsFin.mkAdv ("viime" ++ w.point.s) ; + weekdayNextAdv w = ParadigmsFin.mkAdv ("ensi" ++ w.point.s) ; oper diff --git a/lib/src/swedish/AllSwe.gf b/lib/src/swedish/AllSwe.gf index d539d1692..1c957a49c 100644 --- a/lib/src/swedish/AllSwe.gf +++ b/lib/src/swedish/AllSwe.gf @@ -3,5 +3,6 @@ concrete AllSwe of AllSweAbs = LangSwe - [PassV2], IrregSwe, + ConstructionSwe, ExtraSwe ** {} ; diff --git a/lib/src/swedish/AllSweAbs.gf b/lib/src/swedish/AllSweAbs.gf index 7fd59eb43..fac413e9f 100644 --- a/lib/src/swedish/AllSweAbs.gf +++ b/lib/src/swedish/AllSweAbs.gf @@ -1,5 +1,6 @@ abstract AllSweAbs = Lang - [PassV2] , IrregSweAbs, + Construction, ExtraSweAbs ** {} ; diff --git a/lib/src/swedish/ConstructionSwe.gf b/lib/src/swedish/ConstructionSwe.gf index ae13cf4c7..02ff2e471 100644 --- a/lib/src/swedish/ConstructionSwe.gf +++ b/lib/src/swedish/ConstructionSwe.gf @@ -23,5 +23,22 @@ lin is_wrong_VP = mkVP have_V2 (mkNP (ParadigmsSwe.mkN "fel")) ; n_units_AP card cn a = mkAP (lin AdA (mkUtt (mkNP (lin CN cn)))) (lin A a) ; + +lincat + Weekday = N ; +lin + monday_Weekday = mkN "måndag" ; + tuesday_Weekday = mkN "tisdag" ; + wednesday_Weekday = mkN "onsdag" ; + thursday_Weekday = mkN "torsdag" ; + friday_Weekday = mkN "fredag" ; + saturday_Weekday = mkN "lördag" ; + sunday_Weekday = mkN "söndag" ; + + weekdayPunctualAdv w = SyntaxSwe.mkAdv on_Prep (mkNP w) ; -- på söndag + weekdayHabitualAdv w = SyntaxSwe.mkAdv on_Prep (mkNP aPl_Det w) ; -- på söndagar + weekdayLastAdv w = SyntaxSwe.mkAdv in_Prep (mkNP (E.GenNP (mkNP w))) ; -- i söndags + weekdayNextAdv w = SyntaxSwe.mkAdv (mkPrep "nästa") (mkNP w) ; -- nästa söndag --- can mean a week later than English "next Sunday" + }