added GN & SN categories for constructing names

src/english/CatEng.gf

@@ -106,7 +106,7 @@ concrete CatEng of Cat = CommonX - [Pol,CAdv] ** open ResEng, Prelude in {
     N = {s : Number => Case => Str ; g : Gender} ;
     N2 = {s : Number => Case => Str ; g : Gender} ** {c2 : Str} ;
     N3 = {s : Number => Case => Str ; g : Gender} ** {c2,c3 : Str} ;
-    PN = {s : Case => Str ; g : Gender} ;
+    GN, SN, PN = {s : Case => Str ; g : Gender} ;
 
   lindef
     SSlash = \s -> {s = s; c2 = ""} ;

src/english/DocumentationEng.gf

@@ -38,6 +38,34 @@ lin
          )
     } ;
 
+  InflectionGN = \pn -> {
+    t  = "gn" ;
+    s1 = heading1 ("Given Name" ++
+                    case pn.g of {
+                      Neutr => "";
+                      Masc  => "(masc)";
+                      Fem   => "(fem)"
+                    }) ;
+    s2 = frameTable (
+           tr (th "nom"        ++ th "gen") ++
+           tr (td (pn.s ! Nom) ++ td (pn.s ! Gen))
+         )
+    } ;
+
+  InflectionSN = \pn -> {
+    t  = "sn" ;
+    s1 = heading1 ("Secondary Name" ++
+                    case pn.g of {
+                      Neutr => "";
+                      Masc  => "(masc)";
+                      Fem   => "(fem)"
+                    }) ;
+    s2 = frameTable (
+           tr (th "nom"        ++ th "gen") ++
+           tr (td (pn.s ! Nom) ++ td (pn.s ! Gen))
+         )
+    } ;
+
   InflectionA, InflectionA2 = \adj -> {
     t  = "a" ;
     s1 = heading1 "Adjective" ;

src/english/ExtendEng.gf

@@ -471,4 +471,11 @@ lin UseDAPFem dap = {
 lin CardCNCard card cn =
   {s,sp = \\d,c => card.s ! d ! Nom ++ cn.s ! card.n ! c ; n = Pl} ;
 
+lin GivenName gn = gn ;
+lin Surname sn = sn ;
+lin FullName gn sn = {
+       s = \\c => gn.s ! Nom ++ sn.s ! c ; 
+       g = gn.g
+    } ;
+
 }