better treatment of pronouns in LibraryBrowser

lib/src/api/libraryBrowser/LibraryBrowser.gf

@@ -1,9 +1,14 @@
 abstract LibraryBrowser = 
-  Grammar - 
+  Grammar - [
-    [n2,n3,n4,n5,n6,n7,n8,D_0,D_1,D_2,D_3,D_4,D_5,D_6,D_7,D_8,UseCopula], 
+    n2,n3,n4,n5,n6,n7,n8,D_0,D_1,D_2,D_3,D_4,D_5,D_6,D_7,D_8,
+    UseCopula,
+    UsePron, IndefArt, DefArt, Use2N3, Use3N3
+    ], 
   Lexicon [
     N,   man_N, woman_N, house_N,
     N2,  brother_N2,
+    N3,  distance_N3,
+    PN,  john_PN, paris_PN,
     A,   old_A, young_A, red_A,
     A2,  married_A2,
     V,   sleep_V, walk_V,
@@ -19,4 +24,9 @@ abstract LibraryBrowser =
     ] 
   ** {
   flags startcat = Utt ;
+
+  fun
+    i_NP, you_NP, he_NP, she_NP, we_NP, youPl_NP, youPol_NP, they_NP : NP ;
+    a_Det, the_Det, aPl_Det, thePl_Det : Det ;
+
 }

lib/src/api/libraryBrowser/LibraryBrowserAPI.gf

@@ -82,8 +82,8 @@ lin ComparA a_1 np_2 = mkTerm "comparAP" a_1 np_2 ;
 lin ComparAdvAdj cadv_1 a_2 np_3 = mkTerm "mkAdv" cadv_1 a_2 np_3 ;
 lin ComparAdvAdjS cadv_1 a_2 s_3 = mkTerm "mkAdv" cadv_1 a_2 s_3 ;
 lin ComplA2 a2_1 np_2 = mkTerm "mkAP" a2_1 np_2 ;
-lin ComplN2 n2_1 np_2 = mkTerm "mkCN" n2_1 np_2 ;
+lin ComplN2 n2_1 np_2 = mkTerm "mkCN" (flatIfTerm n2_1) np_2 ;
---lin ComplN3 n3_1 np_2 = mkTerm "mkN2" n3_1 np_2 ;
+lin ComplN3 n3_1 np_2 = mkFlat (mkTerm "mkN2" n3_1 np_2) ;
 lin ComplSlash vpslash_1 np_2 = mkFlat (mkTerm "mkVP" (flatIfTerm vpslash_1) np_2) ;
 --lin ComplSlashIP vpslash_1 ip_2 = mkTerm "mkQVP" vpslash_1 ip_2 ;
 lin ComplVA va_1 ap_2 = mkFlat (mkTerm "mkVP" va_1 (flatIfTerm ap_2)) ;
@@ -114,7 +114,7 @@ lin D_6 = mkTerm "n6_Dig" ;
 lin D_7 = mkTerm "n7_Dig" ;
 lin D_8 = mkTerm "n8_Dig" ;
 lin D_9 = mkTerm "n9_Dig" ;
-lin DefArt = mkTerm "the_Quant" ;
+--lin DefArt = mkTerm "the_Quant" ;
 lin DetCN det_1 cn_2 = mkTerm "mkNP" (flatIfTerm det_1) (flatIfTerm cn_2) ;
 lin DetNP det_1 = mkTerm "mkNP" det_1 ;
 lin DetQuant quant_1 num_2 = mkFlat (mkTerm "mkDet" quant_1 num_2) ;
@@ -137,7 +137,7 @@ lin IdetQuant iquant_1 num_2 = mkTerm "mkIDet" iquant_1 num_2 ;
 lin ImpPl1 vp_1 = mkTerm "lets_Utt" vp_1 ;
 lin ImpVP vp_1 = mkTerm "mkImp" vp_1 ;
 lin ImpersCl vp_1 = mkTerm "mkCl" vp_1 ;
-lin IndefArt = mkTerm "a_Quant" ;
+--lin IndefArt = mkTerm "a_Quant" ;
 lin MassNP cn_1 = mkTerm "mkNP" cn_1 ;
 lin NoPConj = mkTerm (hide "NoPConj") ;
 lin NoVoc = mkTerm (hide "NoVoc") ;
@@ -215,7 +215,7 @@ lin UseComparA a_1 = mkTerm "mkAP" a_1 ;
 lin UseN n_1 = mkFlat (mkTerm "mkCN" n_1) ;
 lin UseN2 n2_1 = mkTerm "mkCN" n2_1 ;
 lin UsePN pn_1 = mkTerm "mkNP" pn_1 ;
-lin UsePron pron_1 = mkTerm "mkNP" pron_1 ;
+--lin UsePron pron_1 = mkTerm "mkNP" pron_1 ;
 lin UseQCl temp_1 pol_2 qcl_3 = mkTerm "mkQS" (flatTerm temp_1) pol_2 qcl_3 ;
 lin UseRCl temp_1 pol_2 rcl_3 = mkTerm "mkRS" (flatTerm temp_1) pol_2 rcl_3 ;
 lin UseSlash temp_1 pol_2 clslash_3 = mkTerm "mkSSlash" temp_1 pol_2 clslash_3 ;
@@ -236,6 +236,21 @@ lin UttS s_1 = mkTerm "mkUtt" s_1 ;
 lin UttVP vp_1 = mkTerm "mkUtt" vp_1 ;
 lin VocNP np_1 = mkTerm "mkVoc" np_1 ;
 
+  lin
+    i_NP = mkTerm "i_NP" ;
+    you_NP = mkTerm "you_NP" ;
+    he_NP = mkTerm "he_NP" ;
+    she_NP = mkTerm "she_NP" ;
+    we_NP = mkTerm "we_NP" ;
+    youPl_NP = mkTerm "youPl_NP" ;
+    youPol_NP = mkTerm "youPol_NP" ;
+    they_NP = mkTerm "they_NP" ;
+
+    a_Det = mkTerm "a_Det" ;
+    the_Det = mkTerm "the_Det" ;
+    aPl_Det = mkTerm "aPl_Det" ;
+    thePl_Det = mkTerm "thePl_Det" ;
+
 lin above_Prep = mkTerm "above_Prep" ;
 --lin active2passive cl_1 = mkTerm "mkCl" cl_1 ;
 lin add_V3 = mkTerm "add_V3" ;

lib/src/api/libraryBrowser/LibraryBrowserDut.gf

@@ -1,11 +1,16 @@
 --# -path=.:alltenses
 
 concrete LibraryBrowserDut of LibraryBrowser = 
-  GrammarDut -
+  GrammarDut - [
-    [n2,n3,n4,n5,n6,n7,n8,D_0,D_1,D_2,D_3,D_4,D_5,D_6,D_7,D_8,UseCopula], 
+    n2,n3,n4,n5,n6,n7,n8,D_0,D_1,D_2,D_3,D_4,D_5,D_6,D_7,D_8,
+    UseCopula,
+    UsePron, IndefArt, DefArt, Use2N3, Use3N3
+    ], 
   LexiconDut [
     N,   man_N, woman_N, house_N,
     N2,  brother_N2,
+    N3,  distance_N3,
+    PN,  john_PN, paris_PN,
     A,   old_A, young_A, red_A,
     A2,  married_A2,
     V,   sleep_V, walk_V,
@@ -19,6 +24,22 @@ concrete LibraryBrowserDut of LibraryBrowser =
     V2S, answer_V2S,
     V2Q, ask_V2Q
     ] 
-  ;
+  ** open (S = SyntaxDut) in {
+  flags startcat = Utt ;
+
+  lin
+    i_NP = S.i_NP ;
+    you_NP = S.you_NP ;
+    he_NP = S.he_NP ;
+    she_NP = S.she_NP ;
+    we_NP = S.we_NP ;
+    youPl_NP = S.youPl_NP ;
+    youPol_NP = S.youPol_NP ;
+    they_NP = S.they_NP ;
+
+    a_Det = S.mkDet S.a_Quant ;
+    the_Det = S.mkDet S.the_Quant ;
+    aPl_Det = S.mkDet S.a_Quant S.plNum ;
+    thePl_Det = S.mkDet S.the_Quant S.plNum ;
+}
 
- 

lib/src/api/libraryBrowser/LibraryBrowserEng.gf

@@ -1,11 +1,16 @@
 --# -path=.:alltenses
 
 concrete LibraryBrowserEng of LibraryBrowser = 
-  GrammarEng -
+  GrammarEng - [
-    [n2,n3,n4,n5,n6,n7,n8,D_0,D_1,D_2,D_3,D_4,D_5,D_6,D_7,D_8,UseCopula], 
+    n2,n3,n4,n5,n6,n7,n8,D_0,D_1,D_2,D_3,D_4,D_5,D_6,D_7,D_8,
+    UseCopula,
+    UsePron, IndefArt, DefArt, Use2N3, Use3N3
+    ], 
   LexiconEng [
     N,   man_N, woman_N, house_N,
     N2,  brother_N2,
+    N3,  distance_N3,
+    PN,  john_PN, paris_PN,
     A,   old_A, young_A, red_A,
     A2,  married_A2,
     V,   sleep_V, walk_V,
@@ -19,4 +24,22 @@ concrete LibraryBrowserEng of LibraryBrowser =
     V2S, answer_V2S,
     V2Q, ask_V2Q
     ] 
-  ;
+  ** open (S = SyntaxEng) in {
+  flags startcat = Utt ;
+
+  lin
+    i_NP = S.i_NP ;
+    you_NP = S.you_NP ;
+    he_NP = S.he_NP ;
+    she_NP = S.she_NP ;
+    we_NP = S.we_NP ;
+    youPl_NP = S.youPl_NP ;
+    youPol_NP = S.youPol_NP ;
+    they_NP = S.they_NP ;
+
+    a_Det = S.mkDet S.a_Quant ;
+    the_Det = S.mkDet S.the_Quant ;
+    aPl_Det = S.mkDet S.a_Quant S.plNum ;
+    thePl_Det = S.mkDet S.the_Quant S.plNum ;
+}
+