From 637242ba45558da9f18c494cbb52858ff4072cb2 Mon Sep 17 00:00:00 2001
From: aarne <aarne@chalmers.se>
Date: Fri, 5 Jun 2009 17:40:26 +0000
Subject: [PATCH] made AllLat compilable and fixed a bug in first declension

---
 next-lib/src/Make.hs            |  4 +--
 next-lib/src/latin/AllLat.gf    | 13 +++-----
 next-lib/src/latin/AllLatAbs.gf |  1 +
 next-lib/src/latin/ExtraLat.gf  | 56 ++-------------------------------
 next-lib/src/latin/ResLat.gf    |  2 +-
 next-lib/src/latin/SymbolLat.gf |  6 ++--
 6 files changed, 16 insertions(+), 66 deletions(-)
 create mode 100644 next-lib/src/latin/AllLatAbs.gf

diff --git a/next-lib/src/Make.hs b/next-lib/src/Make.hs
index e3af0110e..19d19bfa5 100644
--- a/next-lib/src/Make.hs
+++ b/next-lib/src/Make.hs
@@ -54,10 +54,10 @@ langsCoding = [
 langs = map fst langsCoding
 
 -- languagues for which to compile Lang
-langsLang = langs `except` ["Ara","Lat","Pol","Ron","Tur"]
+langsLang = langs `except` ["Ara","Pol","Ron","Tur"]
 
 -- languages for which to compile Try 
-langsAPI  = langsLang `except` ["Bul","Hin","Ina","Rus","Tha"]
+langsAPI  = langsLang `except` ["Bul","Hin","Ina","Lat","Rus","Tha"]
 
 -- languages for which to compile minimal Syntax
 langsMinimal = langs `only` ["Eng","Bul","Ger","Ita"]
diff --git a/next-lib/src/latin/AllLat.gf b/next-lib/src/latin/AllLat.gf
index 87781114e..79f911715 100644
--- a/next-lib/src/latin/AllLat.gf
+++ b/next-lib/src/latin/AllLat.gf
@@ -1,9 +1,6 @@
-----# -path=.:../abstract:../common:prelude
---
---concrete AllLat of AllLatAbs = 
---  LangLat,
---  IrregLat-[
---    blow_V,burn_V,come_V,dig_V,fall_V,fly_V,freeze_V,go_V,lie_V,run_V,
---    sew_V,sing_V,sit_V,sleep_V,spit_V,stand_V,swell_V,swim_V,think_V],
+--# -path=.:../abstract:../common:prelude
+
+concrete AllLat of AllLatAbs = 
+  LangLat
 --  ExtraLat
---  ** {} ;
+  ** {} ;
diff --git a/next-lib/src/latin/AllLatAbs.gf b/next-lib/src/latin/AllLatAbs.gf
new file mode 100644
index 000000000..7b7af3ffa
--- /dev/null
+++ b/next-lib/src/latin/AllLatAbs.gf
@@ -0,0 +1 @@
+abstract AllLatAbs = Lang ;
diff --git a/next-lib/src/latin/ExtraLat.gf b/next-lib/src/latin/ExtraLat.gf
index 09c9059ac..9dad2f9fb 100644
--- a/next-lib/src/latin/ExtraLat.gf
+++ b/next-lib/src/latin/ExtraLat.gf
@@ -1,53 +1,3 @@
---concrete ExtraLat of ExtraLatAbs = CatLat ** 
---  open ResLat, Coordination, Prelude in {
---
---  lin
---    GenNP np = {s,sp = \\_,_ => np.s ! Gen} ;
---    ComplBareVS v s  = insertObj (\\_ => s.s) (predV v) ;
---
---    StrandRelSlash rp slash = {
---      s = \\t,a,p,ag => 
---        rp.s ! RC (fromAgr ag).g Acc ++ slash.s ! t ! a ! p ! ODir ++ slash.c2 ;
---      c = Acc
---      } ;
---    EmptyRelSlash slash = {
---      s = \\t,a,p,_ => slash.s ! t ! a ! p ! ODir ++ slash.c2 ;
---      c = Acc
---      } ;
---
---    StrandQuestSlash ip slash = 
---      {s = \\t,a,b,q => 
---         (mkQuestion (ss (ip.s ! Acc)) slash).s ! t ! a ! b ! q ++ slash.c2
---      };
---
---  lincat
---    VPI   = {s : VPIForm => Agr => Str} ;
---    [VPI] = {s1,s2 : VPIForm => Agr => Str} ;
---
---  lin
---    BaseVPI = twoTable2 VPIForm Agr ;
---    ConsVPI = consrTable2 VPIForm Agr comma ;
---
---    MkVPI vp = {
---      s = \\v,a => vp.ad ++ vp.inf ++ vp.s2 ! a
---      } ;
---    ConjVPI = conjunctDistrTable2 VPIForm Agr ;
---    ComplVPIVV vv vpi = 
---      insertObj (\\a => (if_then_Str vv.isAux [] "to") ++ vpi.s ! VPIInf ! a) (predVV vv) ;
---
---    UncNegCl  t a cl = {s = t.s ++ a.s ++ cl.s ! t.t ! a.a ! neg ! ODir} ;
---    UncNegQCl t a cl = {s = \\q => t.s ++ a.s ++ cl.s ! t.t ! a.a ! neg !q} ;
---    UncNegRCl t a cl = {
---      s = \\r => t.s ++ a.s ++ cl.s ! t.t ! a.a ! neg ! r ;
---      c = cl.c
---      } ;
---    UncNegImpSg imp = {s = imp.s ! neg ! ImpF Sg False} ;
---    UncNegImpPl imp = {s = imp.s ! neg ! ImpF Pl False} ;
---
---    CompoundCN a b = {s = \\n,c => a.s ! Sg ! Nom ++ b.s ! n ! c ; g = b.g} ;
---
---
---  oper
---    neg = CNeg False ; 
---
---} 
+concrete ExtraLat of ExtraLatAbs = CatLat ** 
+  open ResLat, Coordination, Prelude in {
+} 
diff --git a/next-lib/src/latin/ResLat.gf b/next-lib/src/latin/ResLat.gf
index 6c4144180..29bf9db3d 100644
--- a/next-lib/src/latin/ResLat.gf
+++ b/next-lib/src/latin/ResLat.gf
@@ -40,7 +40,7 @@ oper
 
   noun1 : Str -> Noun = \mensa ->
     let 
-      mensae = mensa + "a" ;
+      mensae = mensa + "e" ;
       mensis = init mensa + "is" ;
     in
     mkNoun 
diff --git a/next-lib/src/latin/SymbolLat.gf b/next-lib/src/latin/SymbolLat.gf
index c1572616c..04946b738 100644
--- a/next-lib/src/latin/SymbolLat.gf
+++ b/next-lib/src/latin/SymbolLat.gf
@@ -1,4 +1,6 @@
---concrete SymbolLat of Symbol = CatLat ** open Prelude, ResLat in {
+--# -path=.:abstract:common
+
+concrete SymbolLat of Symbol = CatLat ** open Prelude, ResLat in {
 --
 --lin
 --  SymbPN i = {s = \\c => i.s ; g = Neutr} ; --- c
@@ -34,4 +36,4 @@
 --  BaseSymb = infixSS "and" ;
 --  ConsSymb = infixSS "," ;
 --
---}
+}