Merge branch 'master' of github.com:GrammaticalFramework/gf-rgl

Author: krangelov

src/albanian/CatSqi.gf

@@ -9,8 +9,6 @@ lincat V, VA, VV, VS, VQ = Verb ;
 lincat V2, V2S, V2Q = Verb ** {c2 : Compl} ;
 lincat V3, V2A, V2V = Verb ** {c2,c3 : Compl} ;
 lincat Prep = Compl ;
-lincat Interj = {s : Str} ;
-lincat Voc = {s : Str} ;
 
 lincat Numeral = {s : Str} ;
 lincat Digits  = {s : Str; n : Number; tail : DTail} ;
@@ -24,7 +22,4 @@ lincat Det = {s : Case => Gender => Str; spec : Species; n : Number} ;
 lincat NP = {s: Case => Str; a : Agr} ;
 lincat Pron = {s: Case => Str; acc_clit, dat_clit : Str; a : Agr} ;
 
-lincat PConj = {s : Str} ;
-lincat Phr, Utt = {s : Str} ;
-
 }

src/amharic/ResAmh.gf

@@ -995,8 +995,8 @@ pronNP : (N,A,G,D : Str) -> PerNumGen -> NP = \N,A,G,D,png-> {
     {     
       s = \\c =>case c of
 		{
-		Gen|Dat => affix!c + word;
-		   _    => word + affix!c 
+		Gen|Dat => affix!c ++ Predef.BIND ++ word;
+		   _    => word ++ Predef.BIND ++ affix!c 
 		};
       a = {png = Per3 n Masc ; isPron = False };
       lock_NP = <>

src/french/LangFre.gf

@@ -3,6 +3,7 @@
 concrete LangFre of Lang = 
   GrammarFre,
   LexiconFre
+  ,MarkupFre - [stringMark]
   ,DocumentationFre --# notpresent
   ,ConstructionFre
   ** {

src/kazakh/CatKaz.gf

@@ -9,7 +9,5 @@ lincat V3, V2A, V2V = Verb ** {c2,c3 : Compl} ;
 lincat A = {s : Str} ;
 lincat A2 = A ** {c2 : Compl} ;
 lincat Prep = Compl ;
-lincat Interj = {s : Str} ;
-lincat Voc = {s : Str} ;
 
 }

src/morphodict/MorphoDictChi.gf

@@ -0,0 +1,7 @@
+--# -path=.:alltenses
+concrete MorphoDictChi of MorphoDictChiAbs =
+CatChi [N,A,V,Adv,Prep] **
+open
+ParadigmsChi
+in
+{}

src/morphodict/MorphoDictChiAbs.gf

@@ -0,0 +1,3 @@
+abstract MorphoDictChiAbs =
+  Cat [N,A,V,Adv,Prep] **
+{}