started a separate module for names

src/estonian/CatEst.gf

@@ -91,7 +91,7 @@ concrete CatEst of Cat = CommonX ** open HjkEst, ResEst, Prelude in {
             c2,c3 : Compl ;
             isPre,isPre2 : Bool
             } ;
-    GN, SN, PN = {s : Case  => Str} ;
+    GN, SN, LN, PN = {s : Case  => Str} ;
 
   linref
     VP = \vp -> linV vp.v ;

src/estonian/ExtendEst.gf

@@ -436,10 +436,4 @@ concrete ExtendEst of Extend =
     -- : VP -> Adv ;  -- ilma raamatut nägemata
     WithoutVP vp = {s = "ilma" ++ infVPdefault vp InfMata} ;
 
-
-lin GivenName, MaleSurname, FemaleSurname = \n -> n ;
-lin FullName gn sn = {
-       s = \\c => gn.s ! Nom ++ sn.s ! c
-    } ;
-
 }

src/estonian/GrammarEst.gf

@@ -12,7 +12,8 @@ concrete GrammarEst of Grammar =
   TextX,
   IdiomEst,
   StructuralEst,
-  TenseX
+  TenseX,
+  NamesEst
   ** {
 
 flags startcat = Phr ; unlexer = finnish ; lexer = text ;

src/estonian/NamesEst.gf

@@ -0,0 +1,14 @@
+concrete NamesEst of Names = CatEst ** open ResEst, Prelude in {
+
+lin GivenName, MaleSurname, FemaleSurname = \n -> emptyNP ** {
+      s = \\c => n.s ! npform2case Sg c ;
+      a = agrP3 Sg ;
+      isPron = False
+      } ;
+lin FullName gn sn = emptyNP ** {
+      s = \\c => gn.s ! Nom ++ sn.s ! npform2case Sg c ;
+      a = agrP3 Sg ;
+      isPron = False
+      } ;
+
+}