From cb67cfb0874611f7efb89d92f9a76e0f23dbe274 Mon Sep 17 00:00:00 2001
From: aarne <aarne@cs.chalmers.se>
Date: Mon, 18 Jun 2007 21:21:13 +0000
Subject: [PATCH] fixed the mysterious "file..gfc" error

---
 resource-1.0/Makefile                     | 12 +++++++-----
 resource-1.0/api/SymbolicDan.gf           |  5 -----
 resource-1.0/api/SymbolicRus.gf           |  5 -----
 resource-1.0/mathematical/PredicationI.gf |  4 ++--
 resource-1.0/mathematical/SymbolEng.gf    |  2 +-
 resource-1.0/mathematical/SymbolGer.gf    |  2 +-
 resource-1.0/russian/NounRus.gf           |  5 +++--
 7 files changed, 14 insertions(+), 21 deletions(-)
 delete mode 100644 resource-1.0/api/SymbolicDan.gf
 delete mode 100644 resource-1.0/api/SymbolicRus.gf

diff --git a/resource-1.0/Makefile b/resource-1.0/Makefile
index 56ed7ecde..f42b2cc59 100644
--- a/resource-1.0/Makefile
+++ b/resource-1.0/Makefile
@@ -1,4 +1,4 @@
-GF=gf
+GF=gf -s
 RTS=+RTS -M800M -K100M
 RTSS=+RTS -M1000M -K100M
 
@@ -12,7 +12,7 @@ GFC=$(GFCC) -src
 
 # comment the first and uncomment the second in Windows
 GFCP=$(GFC) -preproc=./mkPresent
-GFCCP=$(GFCC) -preproc=./mkPresent -p
+GFCCP=$(GFCC) -preproc=./mkPresent
 #GFCP=$(GFC) -preproc=mkPresent
 
 
@@ -45,6 +45,7 @@ alltenses:
 	cp -p */*.gfc */*.gfr ../alltenses
 	touch api/Constructors.gf
 	$(GFCC) api/Syntax???.gf
+	cp -p api/Constructors*.gfc api/Constructors*.gfr ../alltenses
 	cp -p api/Syntax*.gfc api/Syntax*.gfr ../alltenses
 
 
@@ -53,7 +54,7 @@ langs:
 	echo "s ;; pm | wf langs.gfcm" | $(GFCA) -path=alltenses:prelude ../alltenses/Lang???.gfc $(RTSS)
 
 api:
-	$(GFCC) api/Constructors???.gf
+#	$(GFCC) api/Constructors???.gf
 	$(GFCC) api/Combinators???.gf
 	$(GFCC) api/Symbolic???.gf
 	cp -p api/*.gfc api/*.gfr ../api
@@ -67,13 +68,14 @@ present:
 	$(GFCP) german/German.gf
 	$(GFCP) italian/Italian.gf
 	$(GFCP) norwegian/Norwegian.gf
-	$(GFCP) russian/LangRus.gf
+	$(GFCP) russian/Russian.gf
 	$(GFCP) spanish/Spanish.gf
 	$(GFCP) swedish/Swedish.gf
 	$(GFCP) common/ConstructX.gf
 	mv */*.gfc */*.gfr ../present
 	touch api/Constructors.gf
 	$(GFCCP) -path=api:present:prelude api/Syntax???.gf
+	mv api/Constructors*.gfc api/Constructors*.gfr ../present
 	mv api/Syntax*.gfc api/Syntax*.gfr ../present
 
 mathematical:
@@ -92,7 +94,7 @@ multimodal:
 	mv multimodal/*.gfc ../multimodal
 
 compiled:
-	cd .. ; tar cvfz compiled.tgz alltenses/ mathematical/ multimodal/ present/ prelude/*.gf?
+	cd .. ; tar cfz compiled.tgz alltenses/ mathematical/ multimodal/ present/ prelude/*.gf?
 
 treebank:
 	gf <mkTreebank.gfs
diff --git a/resource-1.0/api/SymbolicDan.gf b/resource-1.0/api/SymbolicDan.gf
deleted file mode 100644
index cbbe7e0ad..000000000
--- a/resource-1.0/api/SymbolicDan.gf
+++ /dev/null
@@ -1,5 +0,0 @@
---# -path=.:present:mathematical:prelude
-
-resource SymbolicDan = Symbolic with 
-  (Symbol = SymbolDan),
-  (Grammar = GrammarDan) ;
diff --git a/resource-1.0/api/SymbolicRus.gf b/resource-1.0/api/SymbolicRus.gf
deleted file mode 100644
index 622e4b33c..000000000
--- a/resource-1.0/api/SymbolicRus.gf
+++ /dev/null
@@ -1,5 +0,0 @@
---# -path=.:present:mathematical:prelude
-
-resource SymbolicRus = Symbolic with 
-  (Symbol = SymbolRus),
-  (Grammar = GrammarRus) ;
diff --git a/resource-1.0/mathematical/PredicationI.gf b/resource-1.0/mathematical/PredicationI.gf
index bbd24be5c..47cdd87c8 100644
--- a/resource-1.0/mathematical/PredicationI.gf
+++ b/resource-1.0/mathematical/PredicationI.gf
@@ -3,8 +3,8 @@ incomplete concrete PredicationI of Predication = Cat ** open ParamX, Lang in {
 flags optimize = all_subs ;
 
 lin
-  PosCl cl = UseCl TPres ASimul PPos cl ;
-  NegCl cl = UseCl TPres ASimul PNeg cl ;
+  PosCl cl = UseCl Lang.TPres ASimul PPos cl ;
+  NegCl cl = UseCl Lang.TPres ASimul PNeg cl ;
 
 --2 Predication patterns.
 
diff --git a/resource-1.0/mathematical/SymbolEng.gf b/resource-1.0/mathematical/SymbolEng.gf
index ea46628cc..6c328baad 100644
--- a/resource-1.0/mathematical/SymbolEng.gf
+++ b/resource-1.0/mathematical/SymbolEng.gf
@@ -19,7 +19,7 @@ lin
 
   SymbS sy = sy ; 
 
-  SymbNum sy = sy ;
+  SymbNum sy = {s = sy.s ; n = Sg} ;
   SymbOrd sy = {s = sy.s ++ "th"} ;
 
 lincat 
diff --git a/resource-1.0/mathematical/SymbolGer.gf b/resource-1.0/mathematical/SymbolGer.gf
index 7c569a7e6..5a6828e65 100644
--- a/resource-1.0/mathematical/SymbolGer.gf
+++ b/resource-1.0/mathematical/SymbolGer.gf
@@ -23,7 +23,7 @@ lin
 
   SymbS sy = {s = \\_ => sy.s} ;
 
-  SymbNum n = {s = n.s} ;
+  SymbNum n = {s = n.s ; n = Pl} ;
   SymbOrd n = {s = \\_   => n.s ++ "."} ;
 
 
diff --git a/resource-1.0/russian/NounRus.gf b/resource-1.0/russian/NounRus.gf
index e7643b3f6..a8675dfe5 100644
--- a/resource-1.0/russian/NounRus.gf
+++ b/resource-1.0/russian/NounRus.gf
@@ -82,12 +82,13 @@ concrete NounRus of Noun = CatRus ** open ResRus, Prelude, MorphoRus in {
 -- so just leave a decimal representation, without case-suffixes:
     NumInt i =  {s = table { _ => table {_ => i.s } } } ;
 
- --   OrdInt n = case n of {
+   OrdInt n = variants {} ; ---- TODO
+ -- case n of {
  --      0|2|6 => (uy_oj_EndDecl n.s) ; 
  --      3 => (ti_j_EndDecl n.s) ; 
  --      _ => uy_j_EndDecl n.s }  ;
 
- -- OrdNumeral numeral = 
+   OrdNumeral numeral = variants {} ; ---- TODO
  --  {s = \\ af => (uy_j_EndDecl (numeral.s ! caseAF af ! genAF af)).s!af} ;
 
     NumNumeral n = n ;