From 8fbdf3e57c84fbfa6b84cab351c9f2b97bd0ce8e Mon Sep 17 00:00:00 2001
From: aarne <aarne@cs.chalmers.se>
Date: Wed, 1 Oct 2008 12:11:29 +0000
Subject: [PATCH] Italian "quello" corrected

---
 examples/tutorial/food/FoodIta.gf      |  2 +-
 examples/tutorial/foods/FoodsIta.gf    |  4 ++--
 examples/tutorial/syntax/GrammarIta.gf | 10 ++++++++--
 3 files changed, 11 insertions(+), 5 deletions(-)

diff --git a/examples/tutorial/food/FoodIta.gf b/examples/tutorial/food/FoodIta.gf
index fc59e1294..913e335ff 100644
--- a/examples/tutorial/food/FoodIta.gf
+++ b/examples/tutorial/food/FoodIta.gf
@@ -6,7 +6,7 @@ concrete FoodIta of Food = {
   lin
     Is item quality = {s = item.s ++ "è" ++ quality.s} ;
     This kind = {s = "questo" ++ kind.s} ;
-    That kind = {s = "quello" ++ kind.s} ;
+    That kind = {s = "quel" ++ kind.s} ;
     QKind quality kind = {s = kind.s ++ quality.s} ;
     Wine = {s = "vino"} ;
     Cheese = {s = "formaggio"} ;
diff --git a/examples/tutorial/foods/FoodsIta.gf b/examples/tutorial/foods/FoodsIta.gf
index 0099058d0..099bbebcf 100644
--- a/examples/tutorial/foods/FoodsIta.gf
+++ b/examples/tutorial/foods/FoodsIta.gf
@@ -12,9 +12,9 @@ concrete FoodsIta of Foods = open Prelude in {
     Is item quality = 
       ss (item.s ++ copula item.n ++ quality.s ! item.g ! item.n) ;
     This  = det Sg "questo" "questa" ;
-    That  = det Sg "quello" "quella" ;
+    That  = det Sg "quel"   "quella" ;
     These = det Pl "questi" "queste" ;
-    Those = det Pl "quelli" "quelle" ;
+    Those = det Pl "quei"   "quelle" ;
     QKind quality kind = {
       s = \\n => kind.s ! n ++ quality.s ! kind.g ! n ;
       g = kind.g
diff --git a/examples/tutorial/syntax/GrammarIta.gf b/examples/tutorial/syntax/GrammarIta.gf
index 04b112ed9..81c0e79fe 100644
--- a/examples/tutorial/syntax/GrammarIta.gf
+++ b/examples/tutorial/syntax/GrammarIta.gf
@@ -66,9 +66,9 @@ concrete GrammarIta of Grammar = open Prelude, MorphoIta in {
     UseV v = {s = \\b,_,n => posneg b ++ v.s ! n} ;
 
     this_Det = mkDet Sg (regAdjective "questo") ;
-    that_Det = mkDet Sg (regAdjective "quello") ;
+    that_Det = mkDet Sg quello ;
     these_Det = mkDet Pl (regAdjective "questo") ;
-    those_Det = mkDet Pl (regAdjective "quello") ;
+    those_Det = mkDet Pl quello ;
     every_Det = {s = \\_ => "ogni" ; n = Sg} ;
     theSg_Det = {s = artDef Sg ; n = Sg} ;
     thePl_Det = {s = artDef Pl ; n = Pl} ;
@@ -125,6 +125,12 @@ concrete GrammarIta of Grammar = open Prelude, MorphoIta in {
       _ => h
     } ;
 
+    quello : Adjective = 
+      let 
+        quel = pre {"quel"  ; "quello" / sImpuro ; "quell'" / vowel} ;
+        quei = pre {"quei"  ; "quegli" / sImpuro ; "quegli" / vowel} ;
+      in mkAdjective quel "quella" quei "quelle" ;
+
     sImpuro : Strs = strs {"sb" ; "sp" ; "sy" ; "z"} ;
     vowel   : Strs = strs {"a" ; "e" ; "i" ; "o" ; "u"} ;