preliminary Italian in Attempto

4 files changed, 11 insertions, 10 deletions

diff --git a/next-lib/src/Make.hs b/next-lib/src/Make.hs
index 53428586e..9fca1713a 100644
--- a/next-lib/src/Make.hs
+++ b/next-lib/src/Make.hs
@@ -56,7 +56,7 @@ langsLang = langs `except` ["Ara","Ina"]
 langsAPI  = langsLang `except` ["Ara","Hin","Ina","Tha"]
 
 -- languages for which to compile minimal Syntax
-langsMinimal = langs `only` ["Eng","Bul","Ita"]
+langsMinimal = langs `only` ["Eng","Bul","Ger","Ita"]
 
 -- languages for which to run treebank test
 langsTest = langsLang `except` ["Ara","Bul","Cat","Hin","Rus","Spa","Tha"]
diff --git a/next-lib/src/api/Constructors.gf b/next-lib/src/api/Constructors.gf
index a407c3440..c9e227ccf 100644
--- a/next-lib/src/api/Constructors.gf
+++ b/next-lib/src/api/Constructors.gf
@@ -1369,12 +1369,12 @@ incomplete resource Constructors = open Grammar in {
                                          =    AdvIP --# notminimal
       } ;  
 
-    mkIDet = overload { --# notminimal
+    mkIDet = overload { 
       mkIDet : IQuant -> Num -> IDet          -- which (songs) --# notminimal
                      =  \i,nu -> IdetQuant i nu ; --# notminimal
-      mkIDet : IQuant -> IDet      -- which (song) --# notminimal
-                     =  \i -> IdetQuant i NumSg ; --# notminimal
-      } ; --# notminimal
+      mkIDet : IQuant -> IDet      
+                     =  \i -> IdetQuant i NumSg ; 
+      } ; 
 
     whichSg_IDet : IDet = IdetQuant which_IQuant NumSg ; --# notminimal
     whichPl_IDet : IDet = IdetQuant which_IQuant NumPl ; --# notminimal
diff --git a/next-lib/src/german/StructuralGer.gf b/next-lib/src/german/StructuralGer.gf
index b8bba0170..723837974 100644
--- a/next-lib/src/german/StructuralGer.gf
+++ b/next-lib/src/german/StructuralGer.gf
@@ -1,6 +1,6 @@
 concrete StructuralGer of Structural = CatGer ** 
 
-  open MorphoGer, (X = ConstructX), Prelude in {
+  open MorphoGer, MakeStructuralGer, (X = ConstructX), Prelude in {
 
   flags optimize=all ;
 
diff --git a/next-lib/src/italian/StructuralIta.gf b/next-lib/src/italian/StructuralIta.gf
index 37ab6ac4c..1cd96d3af 100644
--- a/next-lib/src/italian/StructuralIta.gf
+++ b/next-lib/src/italian/StructuralIta.gf
@@ -1,6 +1,6 @@
 concrete StructuralIta of Structural = CatIta ** 
   open 
-  PhonoIta, MorphoIta, 
+  PhonoIta, MorphoIta, MakeStructuralIta,
   ParadigmsIta, BeschIta, (X = ConstructX), Prelude in {
 
   flags optimize=all ; coding=utf8 ;
@@ -152,9 +152,9 @@ lin
     mkPronoun
       "Lei" "La" "Le" "Glie" "Lei" "Suo" "Sua" "Suoi" "Sue"
       Masc Sg P3 ;
-  not_Predet = {s = \\a,c => prepCase c ++ "pas" ; c = Nom} ;
-  nothing_but_Predet = {s = \\a,c => prepCase c ++ "rien excepté" ; c = Nom} ;
-  nobody_but_Predet = {s = \\a,c => prepCase c ++ "personne excepté" ; c = Nom} ;
+  not_Predet = {s = \\a,c => prepCase c ++ "non" ; c = Nom} ;
+  nothing_but_Predet = {s = \\a,c => prepCase c ++ "niente eccetto" ; c = Nom} ;
+  nobody_but_Predet = {s = \\a,c => prepCase c ++ "nessun eccetto" ; c = Nom} ;
 
 
   no_Quant = 
@@ -175,5 +175,6 @@ lin
   at_most_AdN = ss "al massimo" ;
 
   as_CAdv = X.mkCAdv "così" conjThan ;
+  except_Prep = mkPrep "eccetto" ;
 }