Add containers to Construction*.gf + missing saturday_Weekday in the abstract

lib/src/abstract/Construction.gf

@@ -34,6 +34,11 @@ fun
 
   n_units_AP    : Card -> CN -> A -> AP ;  -- x inches long
 
+-- containers
+  bottle_of_CN : NP -> CN ;       -- bottle of beer / flaska öl (Swe)
+  cup_of_CN    : NP -> CN ;       -- cup of tea / kupillinen teetä (Fin)
+  glass_of_CN  : NP -> CN ;
+  
 -- time expressions
 
 cat 
@@ -59,7 +64,7 @@ fun
   intYear     : Int -> Year ;
   intMonthday : Int -> Monthday ;
 
-  monday_Weekday, tuesday_Weekday, wednesday_Weekday, thursday_Weekday, friday_Weekday, sunday_Weekday : Weekday ;
+  monday_Weekday, tuesday_Weekday, wednesday_Weekday, thursday_Weekday, friday_Weekday, saturday_Weekday, sunday_Weekday : Weekday ;
 
   january_Month, february_Month, march_Month, april_Month, may_Month, june_Month, july_Month : Month ;
   august_Month, september_Month, october_Month, november_Month, december_Month : Month ;

lib/src/english/ConstructionEng.gf

@@ -24,6 +24,10 @@ lin
 
   n_units_AP card cn a = mkAP (lin AdA (mkUtt (mkNP <lin Card card : Card> (lin CN cn)))) (lin A a) ;
 
+  bottle_of_CN np = mkCN (lin N2 (mkN2 "bottle")) (lin NP np) ;
+  cup_of_CN    np = mkCN (lin N2 (mkN2 "cup"))    (lin NP np) ;
+  glass_of_CN  np = mkCN (lin N2 (mkN2 "glass"))  (lin NP np) ;
+
 lincat
   Weekday = N ;
   Monthday = NP ;

lib/src/finnish/ConstructionFin.gf

@@ -23,6 +23,11 @@ lin
 
   n_units_AP card cn a = mkAP (lin AdA (mkUtt (lin NP (mkNP <lin Card card : Card> (lin CN cn))))) (lin A a) ;
 
+  bottle_of_CN np = variants {} ; -- mkCN (lin N2 (mkN2 (mkN "pullo" | mkN "pullollinen") (mkPrep partitive))  (lin NP np) ;
+  cup_of_CN    np = variants {} ; -- mkCN (lin N2 (mkN2 (mkN "kuppi" | mkN "kupillinen") (mkPrep partitive))  (lin NP np) ;
+  glass_of_CN  np = variants {} ; -- mkCN (lin N2 (mkN2 (mkN "lasi" | mkN "lasillinen") (mkPrep partitive)) (lin NP np) ;
+
+
 lincat
   Weekday = {noun : N ; habitual : SyntaxFin.Adv} ;
   Monthday = NP ;

lib/src/french/ConstructionFre.gf

@@ -25,6 +25,10 @@ lin
   is_wrong_VP = E.ComplCN have_V2 (mkCN (mkN "tort")) ;
 
   n_units_AP card cn a = mkAP (lin AdA (mkUtt (mkNP <lin Card card : Card> (lin CN cn)))) (lin A a) ;
+
+  bottle_of_CN np = mkCN (lin N2 (mkN2 (mkN "bouteille" feminine) part_Prep)) (lin NP np) ;
+  -- cup_of_CN    np = mkCN (lin N2 (mkN2 "cup"))    (lin NP np) ;
+  -- glass_of_CN  np = mkCN (lin N2 (mkN2 "glass"))  (lin NP np) ;
   
 lincat
   Weekday = N ;

lib/src/german/ConstructionGer.gf

@@ -2,7 +2,7 @@
 
 concrete ConstructionGer of Construction = CatGer ** 
   open SyntaxGer, SymbolicGer, ParadigmsGer, 
-       (L = LexiconGer), (E = ExtraGer), (G = GrammarGer), (I = IrregGer), (R = ResGer), Prelude in {
+       (L = LexiconGer), (E = ExtraGer), (G = GrammarGer), (I = IrregGer), (R = ResGer), (N = NounGer), Prelude in {
 
 
 lin
@@ -27,7 +27,9 @@ lin
 
   n_units_AP card cn a = mkAP (lin AdA (mkUtt (mkNP <lin Card card : Card> (lin CN cn)))) (lin A a) ;
  
-
+  bottle_of_CN np = N.ApposCN (mkCN (mkN "Flasche")) (lin NP np) ;
+  cup_of_CN np    = N.ApposCN (mkCN (mkN "Tasse"))   (lin NP np) ;
+  glass_of_CN np  = N.ApposCN (mkCN (mkN "Glas"))    (lin NP np) ;
 
 lincat
   Weekday = N ;

lib/src/swedish/ConstructionSwe.gf

@@ -24,6 +24,11 @@ lin
 
   n_units_AP card cn a = mkAP (lin AdA (mkUtt (mkNP <lin Card card : Card> (lin CN cn)))) (lin A a) ;
 
+
+  bottle_of_CN np = mkCN (lin N2 (mkN2 (mkN "flaska") noPrep))      (lin NP np) ;
+  cup_of_CN np    = mkCN (lin N2 (mkN2 (mkN "kopp") noPrep))        (lin NP np) ;
+  glass_of_CN np  = mkCN (lin N2 (mkN2 (mkN "glas" "glas") noPrep)) (lin NP np) ;
+
 lincat
   Weekday = N ;
   Monthday = NP ;