checked Ara and Cat w.r.t the new lib structure

lib/resource-1.0/Makefile

@@ -32,8 +32,8 @@ pretest:
 	echo "gr -cat=Cl -number=11 -prob | tb" | $(GF) -probs=lang.gfprob -path=present:prelude -nocf ../present/Lang???.gfc
 
 alltenses:
-	$(GFC) arabic/LangAra.gf
-	$(GFC) catalan/LangCat.gf
+#	$(GFC) arabic/GrammarAra.gf
+#	$(GFC) catalan/Catalan.gf
 	$(GFC) danish/Danish.gf
 	$(GFC) english/English.gf
 	$(GFC) finnish/Finnish.gf
@@ -62,8 +62,17 @@ api:
 	$(GFCC) api/Symbolic???.gf
 	cp -p api/*.gfc api/*.gfr ../api
 
+arabic:
+	$(GFCP) arabic/GrammarAra.gf
+	$(GFC) arabic/GrammarAra.gf
+
+catalan:
+	$(GFCP) catalan/Catalan.gf
+	$(GFC) catalan/Catalan.gf
+
 present:
-#	$(GFCP) arabic/LangAra.gf
+#	$(GFCP) arabic/GrammarAra.gf
+#	$(GFCP) catalan/Catalan.gf
 	$(GFCP) danish/Danish.gf
 	$(GFCP) english/English.gf
 	$(GFCP) finnish/Finnish.gf

lib/resource-1.0/arabic/Arabic.gf

@@ -0,0 +1,3 @@
+--# -path=.:../abstract:../common:prelude
+
+concrete Arabic of ArabicAbs = LangAra ;

lib/resource-1.0/arabic/ArabicAbs.gf

@@ -0,0 +1,3 @@
+--# -path=.:../abstract:../common:prelude
+
+abstract ArabicAbs = Lang ;

lib/resource-1.0/arabic/GrammarAra.gf

@@ -0,0 +1,21 @@
+--# -path=.:../abstract:../common:prelude
+
+concrete GrammarAra of Grammar = 
+  NounAra, 
+  VerbAra, 
+  AdjectiveAra,
+  AdverbAra,
+  NumeralAra,
+  SentenceAra,
+  QuestionAra,
+  RelativeAra,
+  ConjunctionAra,
+  PhraseAra,
+  TextX - [Utt],
+  StructuralAra,
+  IdiomAra
+  ** {
+
+flags startcat = Phr ; unlexer = text ; lexer = text ;
+
+} ;

lib/resource-1.0/arabic/LangAra.gf

@@ -1,22 +1,12 @@
 --# -path=.:../abstract:../common:prelude
 
 concrete LangAra of Lang = 
-  NounAra, 
-  VerbAra, 
-  AdjectiveAra,
-  AdverbAra,
-  NumeralAra,
-  SentenceAra,
-  QuestionAra,
-  RelativeAra,
-  ConjunctionAra,
-  PhraseAra,
-  TextX - [Utt],
-  StructuralAra,
-  IdiomAra,
+  GrammarAra,
   LexiconAra
   ** {
 
-flags startcat = Phr ; unlexer = text ; lexer = text ;
+  flags startcat = Phr ; unlexer = text ; lexer = text ;
+
+}
+
 
-} ;

lib/resource-1.0/arabic/PhraseAra.gf

@@ -8,7 +8,7 @@ concrete PhraseAra of Phrase = CatAra ** open
 
 --    UttS s = s ;
 --    UttQS qs = {s = qs.s ! QDir} ;
-    UttImpSg pol imp = {s = \\g => imp.s ! pol.p ! g ! Sg} ;
+    UttImpSg pol imp = {s = \\g => imp.s ! pol.p ! g ! ResAra.Sg} ;
 --    UttImpPl pol imp = {s = pol.s ++ imp.s ! pol.p ! Pl} ;
 --
 --    UttIP ip = {s = ip.s ! Nom} ; --- Acc also