From b9228de7b89629870d003c3b0788466fde5d4725 Mon Sep 17 00:00:00 2001
From: aarne <aarne@cs.chalmers.se>
Date: Wed, 22 Nov 2006 16:06:11 +0000
Subject: [PATCH] Jordi's and Gloria's patches

---
 lib/resource-1.0/Makefile              | 5 ++++-
 lib/resource-1.0/spanish/NumeralSpa.gf | 2 +-
 2 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/lib/resource-1.0/Makefile b/lib/resource-1.0/Makefile
index b804f144f..5a90dff09 100644
--- a/lib/resource-1.0/Makefile
+++ b/lib/resource-1.0/Makefile
@@ -4,7 +4,10 @@ RTSS=+RTS -M1000M -K100M
 GFCA=$(GF) -nocf
 GFCC=$(GF) -nocf -make
 GFC=$(GFCC) -src
+
+# comment the first and uncomment the second in Windows
 GFCP=$(GFC) -preproc=./mkPresent
+#GFCP=$(GFC) -preproc=mkPresent
 
 
 .PHONY: show-path all test alltenses pretest langs present mathematical multimodal compiled treebank stat gfdoc clean
@@ -55,7 +58,7 @@ present:
 	mv */*.gfc */*.gfr ../present
 
 mathematical:
-	$(GF) -make -nocf -preproc=./mkPresent mathematical/Mathematical???.gf
+	$(GF) -make -nocf $(GFCP) mathematical/Mathematical???.gf
 	mv mathematical/*.gfc ../mathematical
 
 multimodal:
diff --git a/lib/resource-1.0/spanish/NumeralSpa.gf b/lib/resource-1.0/spanish/NumeralSpa.gf
index 33860683c..5e4c5f447 100644
--- a/lib/resource-1.0/spanish/NumeralSpa.gf
+++ b/lib/resource-1.0/spanish/NumeralSpa.gf
@@ -15,7 +15,7 @@ lin n2 =
         "segundo" "duodécimo" "vigésimo" "ducentésimo" ;
 lin n3 = 
   mkTal "tres"   "trece"      "treinta"   "trescientos"   
-        "terzero" "decimotercero" "trigésimo" "tricentesimo" ;
+        "tercero" "decimotercero" "trigésimo" "tricentesimo" ;
 lin n4 = 
   mkTal "cuatro" "catorce"    "cuarenta"  "cuatrocientos" 
         "cuarto" "decimocuarto" "cuadragésimo" "cuadringentesimo" ;