From dc8ca16b04f199b4839971d25233f6ea352e80e0 Mon Sep 17 00:00:00 2001
From: aarne <aarne@cs.chalmers.se>
Date: Mon, 3 Sep 2007 13:54:44 +0000
Subject: [PATCH] these,those in Constructors

---
 examples/tutorial/resource-foods/FoodsEng.gf |  8 +++---
 examples/tutorial/resource-foods/FoodsI.gf   |  8 +++---
 lib/resource-1.0/api/Constructors.gf         | 26 ++++++++++++++++++--
 3 files changed, 32 insertions(+), 10 deletions(-)

diff --git a/examples/tutorial/resource-foods/FoodsEng.gf b/examples/tutorial/resource-foods/FoodsEng.gf
index 3756b8189..5f3a978c3 100644
--- a/examples/tutorial/resource-foods/FoodsEng.gf
+++ b/examples/tutorial/resource-foods/FoodsEng.gf
@@ -8,10 +8,10 @@ concrete FoodsEng of Foods = open SyntaxEng,ParadigmsEng in {
     Quality = AP ;
   lin
     Is item quality = mkUtt (mkCl item quality) ;
-    This kind = mkNP (mkDet this_Quant) kind ;
-    That kind = mkNP (mkDet that_Quant) kind ;
-    These kind = mkNP (mkDet (mkQuantPl this_Quant)) kind ;
-    Those kind = mkNP (mkDet (mkQuantPl that_Quant)) kind ;
+    This kind = mkNP this_QuantSg kind ;
+    That kind = mkNP that_QuantSg kind ;
+    These kind = mkNP these_QuantPl kind ;
+    Those kind = mkNP those_QuantPl kind ;
     QKind quality kind = mkCN quality kind ;
     Wine = mkCN (mkN "wine") ;
     Pizza = mkCN (mkN "pizza") ;
diff --git a/examples/tutorial/resource-foods/FoodsI.gf b/examples/tutorial/resource-foods/FoodsI.gf
index da6cb9366..2ec35f5f9 100644
--- a/examples/tutorial/resource-foods/FoodsI.gf
+++ b/examples/tutorial/resource-foods/FoodsI.gf
@@ -8,10 +8,10 @@ incomplete concrete FoodsI of Foods = open Syntax, LexFoods in {
     Quality = AP ;
   lin
     Is item quality = mkUtt (mkCl item quality) ;
-    This kind = mkNP (mkDet this_Quant) kind ;
-    That kind = mkNP (mkDet that_Quant) kind ;
-    These kind = mkNP (mkDet (mkQuantPl this_Quant)) kind ;
-    Those kind = mkNP (mkDet (mkQuantPl that_Quant)) kind ;
+    This kind = mkNP this_QuantSg kind ;
+    That kind = mkNP that_QuantSg kind ;
+    These kind = mkNP these_QuantPl kind ;
+    Those kind = mkNP those_QuantPl kind ;
     QKind quality kind = mkCN quality kind ;
     Very quality = mkAP very_AdA quality ;
 
diff --git a/lib/resource-1.0/api/Constructors.gf b/lib/resource-1.0/api/Constructors.gf
index 2ab31c5c2..ebb326f65 100644
--- a/lib/resource-1.0/api/Constructors.gf
+++ b/lib/resource-1.0/api/Constructors.gf
@@ -441,6 +441,12 @@ incomplete resource Constructors = open Grammar in {
       massQuant : QuantSg ;  -- 2. (mass terms)
 
 -- More singular quantifiers are available in the $Structural$ module.
+-- The following singular cases of quantifiers are often used.
+
+      the_QuantSg  : QuantSg ; -- 3. the
+      a_QuantSg    : QuantSg ; -- 4. a
+      this_QuantSg : QuantSg ; -- 5. this
+      that_QuantSg : QuantSg ; -- 6. that
 
 
 --3 QuantPl, plural quantifiers
@@ -450,8 +456,14 @@ incomplete resource Constructors = open Grammar in {
 
       mkQuantPl : Quant -> QuantPl ;  -- 1. these
 
--- More plural quantifiers are available in the $Structural$ module.
-   
+-- More plural quantifiers are available in the $Structural$ module.   
+-- The following plural cases of quantifiers are often used.
+
+      the_QuantPl  : QuantPl ; -- 2. the
+      a_QuantPl    : QuantPl ; -- 3. (indefinite plural)
+      these_QuantPl : QuantPl ; -- 4. these
+      those_QuantPl : QuantPl ; -- 5. those
+
 
 --3 Num, cardinal numerals 
 
@@ -1028,6 +1040,16 @@ incomplete resource Constructors = open Grammar in {
 
     massQuant : QuantSg = MassDet  ;
 
+      the_QuantSg  : QuantSg = SgQuant DefArt ;
+      a_QuantSg    : QuantSg = mkQuantSg indefQuant ;
+      this_QuantSg : QuantSg = mkQuantSg this_Quant ;
+      that_QuantSg : QuantSg = mkQuantSg that_Quant ; 
+
+      the_QuantPl  : QuantPl = mkQuantPl defQuant ; 
+      a_QuantPl    : QuantPl = mkQuantPl indefQuant ; 
+      these_QuantPl : QuantPl = mkQuantPl this_Quant ; 
+      those_QuantPl : QuantPl = mkQuantPl that_Quant ; 
+
 
 
     mkNum = overload {