From 04e8c2458eb78e8d65407bd9e9ff2c29168aae1d Mon Sep 17 00:00:00 2001
From: aarne <aarne@cs.chalmers.se>
Date: Sat, 13 Sep 2008 09:38:41 +0000
Subject: [PATCH] "quello" in next-resource Italian corrected

---
 lib/next-resource/api/Combinators.gf       | 13 +++++++++++--
 lib/next-resource/api/CombinatorsAra.gf    |  3 +++
 lib/next-resource/api/CombinatorsBul.gf    |  3 +++
 lib/next-resource/api/CombinatorsCat.gf    |  3 +++
 lib/next-resource/api/CombinatorsDan.gf    |  3 +++
 lib/next-resource/api/CombinatorsFin.gf    |  3 +++
 lib/next-resource/api/CombinatorsFre.gf    |  3 +++
 lib/next-resource/api/CombinatorsGer.gf    |  3 +++
 lib/next-resource/api/CombinatorsHin.gf    |  3 +++
 lib/next-resource/api/CombinatorsIna.gf    |  3 +++
 lib/next-resource/api/CombinatorsIta.gf    |  3 +++
 lib/next-resource/api/CombinatorsNor.gf    |  3 +++
 lib/next-resource/api/CombinatorsRus.gf    |  3 +++
 lib/next-resource/api/CombinatorsSpa.gf    |  3 +++
 lib/next-resource/api/CombinatorsSwe.gf    |  3 +++
 lib/next-resource/api/CombinatorsTha.gf    |  3 +++
 lib/next-resource/api/Syntax.gf            |  2 +-
 lib/next-resource/api/SyntaxBul.gf         |  2 +-
 lib/next-resource/api/SyntaxCat.gf         |  2 +-
 lib/next-resource/api/SyntaxDan.gf         |  2 +-
 lib/next-resource/api/SyntaxEng.gf         |  3 ++-
 lib/next-resource/api/SyntaxFin.gf         |  2 +-
 lib/next-resource/api/SyntaxFre.gf         |  2 +-
 lib/next-resource/api/SyntaxGer.gf         |  2 +-
 lib/next-resource/api/SyntaxIta.gf         |  2 +-
 lib/next-resource/api/SyntaxNor.gf         |  2 +-
 lib/next-resource/api/SyntaxRus.gf         |  2 +-
 lib/next-resource/api/SyntaxSpa.gf         |  3 ++-
 lib/next-resource/api/SyntaxSwe.gf         |  3 ++-
 lib/next-resource/italian/StructuralIta.gf | 13 ++++++++-----
 30 files changed, 80 insertions(+), 20 deletions(-)
 create mode 100644 lib/next-resource/api/CombinatorsAra.gf
 create mode 100644 lib/next-resource/api/CombinatorsBul.gf
 create mode 100644 lib/next-resource/api/CombinatorsCat.gf
 create mode 100644 lib/next-resource/api/CombinatorsDan.gf
 create mode 100644 lib/next-resource/api/CombinatorsFin.gf
 create mode 100644 lib/next-resource/api/CombinatorsFre.gf
 create mode 100644 lib/next-resource/api/CombinatorsGer.gf
 create mode 100644 lib/next-resource/api/CombinatorsHin.gf
 create mode 100644 lib/next-resource/api/CombinatorsIna.gf
 create mode 100644 lib/next-resource/api/CombinatorsIta.gf
 create mode 100644 lib/next-resource/api/CombinatorsNor.gf
 create mode 100644 lib/next-resource/api/CombinatorsRus.gf
 create mode 100644 lib/next-resource/api/CombinatorsSpa.gf
 create mode 100644 lib/next-resource/api/CombinatorsSwe.gf
 create mode 100644 lib/next-resource/api/CombinatorsTha.gf

diff --git a/lib/next-resource/api/Combinators.gf b/lib/next-resource/api/Combinators.gf
index 5f90335a0..23426df08 100644
--- a/lib/next-resource/api/Combinators.gf
+++ b/lib/next-resource/api/Combinators.gf
@@ -34,7 +34,11 @@ incomplete resource Combinators = open Grammar in {
       app : N2 -> NP -> NP ; 
       app : N3 -> NP -> NP -> NP ;
       app : N2 -> NP -> NP -> NP ;
-      app : N2 -> N -> CN
+      app : N2 -> N  -> CN ;
+
+      app : N2 -> NP -> CN ;         -- divisor of x
+      app : N3 -> NP -> NP -> CN ;   -- path from x to y
+      app : N2 -> NP -> NP -> CN ;   -- path between x and y
       } ;
 
 --2 Coordination
@@ -126,7 +130,12 @@ incomplete resource Combinators = open Grammar in {
       app : N2 -> NP -> NP -> NP
                                        = \n,x,y -> (DetArtSg DefArt (ComplN2 n (ConjNP and_Conj (BaseNP x y)))) ;
       app : N2 -> N -> CN
-                                       = \f,n -> ComplN2 f (DetArtPl (IndefArt) (UseN n))
+                                       = \f,n -> ComplN2 f (DetArtPl (IndefArt) (UseN n)) ;
+
+      app : N2 -> NP -> CN = ComplN2 ;
+      app : N3 -> NP -> NP -> CN = \n,x,y -> ComplN2 (ComplN3 n x) y ; 
+      app : N2 -> NP -> NP -> CN = \n,x,y -> 
+        ComplN2 n (ConjNP and_Conj (BaseNP x y)) ;
       } ;
 
     coord = overload {
diff --git a/lib/next-resource/api/CombinatorsAra.gf b/lib/next-resource/api/CombinatorsAra.gf
new file mode 100644
index 000000000..707b6be7d
--- /dev/null
+++ b/lib/next-resource/api/CombinatorsAra.gf
@@ -0,0 +1,3 @@
+--# -path=.:alltenses:prelude
+
+resource CombinatorsAra = Combinators with (Grammar = GrammarAra) ;
diff --git a/lib/next-resource/api/CombinatorsBul.gf b/lib/next-resource/api/CombinatorsBul.gf
new file mode 100644
index 000000000..882a7c875
--- /dev/null
+++ b/lib/next-resource/api/CombinatorsBul.gf
@@ -0,0 +1,3 @@
+--# -path=.:alltenses:prelude
+
+resource CombinatorsBul = Combinators with (Grammar = GrammarBul) ;
diff --git a/lib/next-resource/api/CombinatorsCat.gf b/lib/next-resource/api/CombinatorsCat.gf
new file mode 100644
index 000000000..af78ebfda
--- /dev/null
+++ b/lib/next-resource/api/CombinatorsCat.gf
@@ -0,0 +1,3 @@
+--# -path=.:alltenses:prelude
+
+resource CombinatorsCat = Combinators with (Grammar = GrammarCat) ;
diff --git a/lib/next-resource/api/CombinatorsDan.gf b/lib/next-resource/api/CombinatorsDan.gf
new file mode 100644
index 000000000..dff911eba
--- /dev/null
+++ b/lib/next-resource/api/CombinatorsDan.gf
@@ -0,0 +1,3 @@
+--# -path=.:alltenses:prelude
+
+resource CombinatorsDan = Combinators with (Grammar = GrammarDan) ;
diff --git a/lib/next-resource/api/CombinatorsFin.gf b/lib/next-resource/api/CombinatorsFin.gf
new file mode 100644
index 000000000..e5da96407
--- /dev/null
+++ b/lib/next-resource/api/CombinatorsFin.gf
@@ -0,0 +1,3 @@
+--# -path=.:alltenses:prelude
+
+resource CombinatorsFin = Combinators with (Grammar = GrammarFin) ;
diff --git a/lib/next-resource/api/CombinatorsFre.gf b/lib/next-resource/api/CombinatorsFre.gf
new file mode 100644
index 000000000..48d2166e4
--- /dev/null
+++ b/lib/next-resource/api/CombinatorsFre.gf
@@ -0,0 +1,3 @@
+--# -path=.:alltenses:prelude
+
+resource CombinatorsFre = Combinators with (Grammar = GrammarFre) ;
diff --git a/lib/next-resource/api/CombinatorsGer.gf b/lib/next-resource/api/CombinatorsGer.gf
new file mode 100644
index 000000000..e209fa136
--- /dev/null
+++ b/lib/next-resource/api/CombinatorsGer.gf
@@ -0,0 +1,3 @@
+--# -path=.:alltenses:prelude
+
+resource CombinatorsGer = Combinators with (Grammar = GrammarGer) ;
diff --git a/lib/next-resource/api/CombinatorsHin.gf b/lib/next-resource/api/CombinatorsHin.gf
new file mode 100644
index 000000000..e75f470c2
--- /dev/null
+++ b/lib/next-resource/api/CombinatorsHin.gf
@@ -0,0 +1,3 @@
+--# -path=.:alltenses:prelude
+
+resource CombinatorsHin = Combinators with (Grammar = GrammarHin) ;
diff --git a/lib/next-resource/api/CombinatorsIna.gf b/lib/next-resource/api/CombinatorsIna.gf
new file mode 100644
index 000000000..43db76efb
--- /dev/null
+++ b/lib/next-resource/api/CombinatorsIna.gf
@@ -0,0 +1,3 @@
+--# -path=.:alltenses:prelude
+
+resource CombinatorsIna = Combinators with (Grammar = GrammarIna) ;
diff --git a/lib/next-resource/api/CombinatorsIta.gf b/lib/next-resource/api/CombinatorsIta.gf
new file mode 100644
index 000000000..40c8ec880
--- /dev/null
+++ b/lib/next-resource/api/CombinatorsIta.gf
@@ -0,0 +1,3 @@
+--# -path=.:alltenses:prelude
+
+resource CombinatorsIta = Combinators with (Grammar = GrammarIta) ;
diff --git a/lib/next-resource/api/CombinatorsNor.gf b/lib/next-resource/api/CombinatorsNor.gf
new file mode 100644
index 000000000..780c88ab7
--- /dev/null
+++ b/lib/next-resource/api/CombinatorsNor.gf
@@ -0,0 +1,3 @@
+--# -path=.:alltenses:prelude
+
+resource CombinatorsNor = Combinators with (Grammar = GrammarNor) ;
diff --git a/lib/next-resource/api/CombinatorsRus.gf b/lib/next-resource/api/CombinatorsRus.gf
new file mode 100644
index 000000000..b99b55551
--- /dev/null
+++ b/lib/next-resource/api/CombinatorsRus.gf
@@ -0,0 +1,3 @@
+--# -path=.:alltenses:prelude
+
+resource CombinatorsRus = Combinators with (Grammar = GrammarRus) ;
diff --git a/lib/next-resource/api/CombinatorsSpa.gf b/lib/next-resource/api/CombinatorsSpa.gf
new file mode 100644
index 000000000..43b881b50
--- /dev/null
+++ b/lib/next-resource/api/CombinatorsSpa.gf
@@ -0,0 +1,3 @@
+--# -path=.:alltenses:prelude
+
+resource CombinatorsSpa = Combinators with (Grammar = GrammarSpa) ;
diff --git a/lib/next-resource/api/CombinatorsSwe.gf b/lib/next-resource/api/CombinatorsSwe.gf
new file mode 100644
index 000000000..c3b9a0350
--- /dev/null
+++ b/lib/next-resource/api/CombinatorsSwe.gf
@@ -0,0 +1,3 @@
+--# -path=.:alltenses:prelude
+
+resource CombinatorsSwe = Combinators with (Grammar = GrammarSwe) ;
diff --git a/lib/next-resource/api/CombinatorsTha.gf b/lib/next-resource/api/CombinatorsTha.gf
new file mode 100644
index 000000000..5c77348b3
--- /dev/null
+++ b/lib/next-resource/api/CombinatorsTha.gf
@@ -0,0 +1,3 @@
+--# -path=.:alltenses:prelude
+
+resource CombinatorsTha = Combinators with (Grammar = GrammarTha) ;
diff --git a/lib/next-resource/api/Syntax.gf b/lib/next-resource/api/Syntax.gf
index 0350a9783..1302e6391 100644
--- a/lib/next-resource/api/Syntax.gf
+++ b/lib/next-resource/api/Syntax.gf
@@ -1,4 +1,4 @@
 --# -path=.:alltenses:prelude
 
-interface Syntax = Constructors, Cat, Structural, Numeral ;
+interface Syntax = Constructors, Cat, Structural, Combinators ;
 
diff --git a/lib/next-resource/api/SyntaxBul.gf b/lib/next-resource/api/SyntaxBul.gf
index 03e9dff60..ff11f6888 100644
--- a/lib/next-resource/api/SyntaxBul.gf
+++ b/lib/next-resource/api/SyntaxBul.gf
@@ -1,4 +1,4 @@
 --# -path=.:alltenses:prelude
 
-instance SyntaxBul of Syntax = ConstructorsBul, CatBul, StructuralBul, NumeralBul ;
+instance SyntaxBul of Syntax = ConstructorsBul, CatBul, StructuralBul, CombinatorsBul ;
 
diff --git a/lib/next-resource/api/SyntaxCat.gf b/lib/next-resource/api/SyntaxCat.gf
index a18726806..73ff4829c 100644
--- a/lib/next-resource/api/SyntaxCat.gf
+++ b/lib/next-resource/api/SyntaxCat.gf
@@ -1,4 +1,4 @@
 --# -path=.:alltenses:prelude
 
-instance SyntaxCat of Syntax = ConstructorsCat, CatCat, StructuralCat, NumeralCat ;
+instance SyntaxCat of Syntax = ConstructorsCat, CatCat, StructuralCat, CombinatorsCat ;
 
diff --git a/lib/next-resource/api/SyntaxDan.gf b/lib/next-resource/api/SyntaxDan.gf
index 43430ce0f..83d07d828 100644
--- a/lib/next-resource/api/SyntaxDan.gf
+++ b/lib/next-resource/api/SyntaxDan.gf
@@ -1,4 +1,4 @@
 --# -path=.:alltenses:prelude
 
-instance SyntaxDan of Syntax = ConstructorsDan, CatDan, StructuralDan, NumeralDan ;
+instance SyntaxDan of Syntax = ConstructorsDan, CatDan, StructuralDan, CombinatorsDan ;
 
diff --git a/lib/next-resource/api/SyntaxEng.gf b/lib/next-resource/api/SyntaxEng.gf
index 0ee6e55bc..940ee0573 100644
--- a/lib/next-resource/api/SyntaxEng.gf
+++ b/lib/next-resource/api/SyntaxEng.gf
@@ -1,4 +1,5 @@
 --# -path=.:alltenses:prelude
 
-instance SyntaxEng of Syntax = ConstructorsEng, CatEng, StructuralEng, NumeralEng ;
+instance SyntaxEng of Syntax = 
+  ConstructorsEng, CatEng, StructuralEng, CombinatorsEng ;
 
diff --git a/lib/next-resource/api/SyntaxFin.gf b/lib/next-resource/api/SyntaxFin.gf
index eef68d094..300c56175 100644
--- a/lib/next-resource/api/SyntaxFin.gf
+++ b/lib/next-resource/api/SyntaxFin.gf
@@ -1,4 +1,4 @@
 --# -path=.:alltenses:prelude
 
-instance SyntaxFin of Syntax = ConstructorsFin, CatFin, StructuralFin, NumeralFin ;
+instance SyntaxFin of Syntax = ConstructorsFin, CatFin, StructuralFin, CombinatorsFin ;
 
diff --git a/lib/next-resource/api/SyntaxFre.gf b/lib/next-resource/api/SyntaxFre.gf
index 52fd74354..8f5ffa206 100644
--- a/lib/next-resource/api/SyntaxFre.gf
+++ b/lib/next-resource/api/SyntaxFre.gf
@@ -1,4 +1,4 @@
 --# -path=.:alltenses:prelude
 
-instance SyntaxFre of Syntax = ConstructorsFre, CatFre, StructuralFre, NumeralFre ;
+instance SyntaxFre of Syntax = ConstructorsFre, CatFre, StructuralFre, CombinatorsFre ;
 
diff --git a/lib/next-resource/api/SyntaxGer.gf b/lib/next-resource/api/SyntaxGer.gf
index 87b3d03a9..59f495279 100644
--- a/lib/next-resource/api/SyntaxGer.gf
+++ b/lib/next-resource/api/SyntaxGer.gf
@@ -1,4 +1,4 @@
 --# -path=.:alltenses:prelude
 
-instance SyntaxGer of Syntax = ConstructorsGer, CatGer, StructuralGer, NumeralGer ;
+instance SyntaxGer of Syntax = ConstructorsGer, CatGer, StructuralGer, CombinatorsGer ;
 
diff --git a/lib/next-resource/api/SyntaxIta.gf b/lib/next-resource/api/SyntaxIta.gf
index 6b0f99b3a..3bba98dd5 100644
--- a/lib/next-resource/api/SyntaxIta.gf
+++ b/lib/next-resource/api/SyntaxIta.gf
@@ -1,4 +1,4 @@
 --# -path=.:alltenses:prelude
 
-instance SyntaxIta of Syntax = ConstructorsIta, CatIta, StructuralIta, NumeralIta ;
+instance SyntaxIta of Syntax = ConstructorsIta, CatIta, StructuralIta, CombinatorsIta ;
 
diff --git a/lib/next-resource/api/SyntaxNor.gf b/lib/next-resource/api/SyntaxNor.gf
index ee2ad1bb7..98b4d41cf 100644
--- a/lib/next-resource/api/SyntaxNor.gf
+++ b/lib/next-resource/api/SyntaxNor.gf
@@ -1,5 +1,5 @@
 --# -path=.:alltenses:prelude
 
-instance SyntaxNor of Syntax = ConstructorsNor, CatNor, StructuralNor, NumeralNor
+instance SyntaxNor of Syntax = ConstructorsNor, CatNor, StructuralNor, CombinatorsNor
  ;
 
diff --git a/lib/next-resource/api/SyntaxRus.gf b/lib/next-resource/api/SyntaxRus.gf
index 0804e209f..56f750acb 100644
--- a/lib/next-resource/api/SyntaxRus.gf
+++ b/lib/next-resource/api/SyntaxRus.gf
@@ -1,4 +1,4 @@
 --# -path=.:alltenses:prelude
 
-instance SyntaxRus of Syntax = ConstructorsRus, CatRus, StructuralRus, NumeralRus ;
+instance SyntaxRus of Syntax = ConstructorsRus, CatRus, StructuralRus, CombinatorsRus ;
 
diff --git a/lib/next-resource/api/SyntaxSpa.gf b/lib/next-resource/api/SyntaxSpa.gf
index 7cf6b7646..40315b430 100644
--- a/lib/next-resource/api/SyntaxSpa.gf
+++ b/lib/next-resource/api/SyntaxSpa.gf
@@ -1,4 +1,5 @@
 --# -path=.:alltenses:prelude
 
-instance SyntaxSpa of Syntax = ConstructorsSpa, CatSpa, StructuralSpa, NumeralSpa ;
+instance SyntaxSpa of Syntax = 
+  ConstructorsSpa, CatSpa, StructuralSpa, CombinatorsSpa ;
 
diff --git a/lib/next-resource/api/SyntaxSwe.gf b/lib/next-resource/api/SyntaxSwe.gf
index ecf6bbb05..b1b603f8e 100644
--- a/lib/next-resource/api/SyntaxSwe.gf
+++ b/lib/next-resource/api/SyntaxSwe.gf
@@ -1,4 +1,5 @@
 --# -path=.:alltenses:prelude
 
-instance SyntaxSwe of Syntax = ConstructorsSwe, CatSwe, StructuralSwe, NumeralSwe ;
+instance SyntaxSwe of Syntax = 
+  ConstructorsSwe, CatSwe, StructuralSwe, CombinatorsSwe ;
 
diff --git a/lib/next-resource/italian/StructuralIta.gf b/lib/next-resource/italian/StructuralIta.gf
index fdb0aafd5..c8d3618a3 100644
--- a/lib/next-resource/italian/StructuralIta.gf
+++ b/lib/next-resource/italian/StructuralIta.gf
@@ -82,13 +82,16 @@ lin
   something_NP = pn2np (mkPN ["qualche cosa"] Masc) ;
   somewhere_Adv = ss ["qualche parte"] ;
   that_Quant = let
-    quello : Number => Gender => Case => Str = table {
-      Sg => \\g,c => prepCase c ++ genForms "quello" "quella" ! g ;
-      Pl => \\g,c => prepCase c ++ genForms "quelli" "quelle" ! g ---- quegli
+    quello : Str -> Str -> Number => Gender => Case => Str = 
+     \quel, quelli -> table {
+      Sg => \\g,c => prepCase c ++ genForms quel "quella" ! g ;
+      Pl => \\g,c => prepCase c ++ genForms quelli "quelle" ! g ---- quegli
       }
     in {
-      s = \\_ => quello ;
-      sp = quello ;
+      s = \\_ => 
+        quello (elision "quel" "quell'" "quello") 
+               (elision "quelli" "quegli" "quegli")  ;
+      sp = quello "quello" "quelli" ;
       s2 = []
       } ;