From 15d8aed389386cf4bd64332f8237c5fd25b33b43 Mon Sep 17 00:00:00 2001
From: aarne <aarne@cs.chalmers.se>
Date: Thu, 3 Jan 2008 17:11:32 +0000
Subject: [PATCH] fixed Swadesh for new resource version

---
 examples/bronzeage/BronzeageI.gf                         | 2 +-
 examples/bronzeage/SwadeshI.gf                           | 7 ++++---
 examples/uusisuomi/Makefile                              | 3 ++-
 examples/uusisuomi/{correct-NSK.txt => correct-NSSK.txt} | 0
 4 files changed, 7 insertions(+), 5 deletions(-)
 rename examples/uusisuomi/{correct-NSK.txt => correct-NSSK.txt} (100%)

diff --git a/examples/bronzeage/BronzeageI.gf b/examples/bronzeage/BronzeageI.gf
index 86def573a..23693dc6f 100644
--- a/examples/bronzeage/BronzeageI.gf
+++ b/examples/bronzeage/BronzeageI.gf
@@ -30,7 +30,7 @@ incomplete concrete BronzeageI of Bronzeage = open Lang in {
 
     UsePron p = Lang.UsePron p ;
     DetCN d n = Lang.DetCN d n ;
-    NumCN k cn = Lang.DetCN (DetPl (PlQuant IndefArt) k NoOrd) cn ;
+    NumCN k cn = Lang.DetCN (DetPl (IndefArt) k NoOrd) cn ;
 
     UseN n = Lang.UseN n ;
     ModCN a cn = AdjCN (PositA a) cn ;
diff --git a/examples/bronzeage/SwadeshI.gf b/examples/bronzeage/SwadeshI.gf
index a622bed2b..0cd3fcd32 100644
--- a/examples/bronzeage/SwadeshI.gf
+++ b/examples/bronzeage/SwadeshI.gf
@@ -20,8 +20,8 @@ incomplete concrete SwadeshI of Swadesh = open Lang in {
 
     -- Determiners
 
-    this_Det = DetSg (SgQuant this_Quant) NoOrd ;
-    that_Det = DetSg (SgQuant that_Quant) NoOrd ;
+    this_Det = DetSg (this_Quant) NoOrd ;
+    that_Det = DetSg (that_Quant) NoOrd ;
     many_Det = Lang.many_Det ;
     some_Det = someSg_Det ;
 ----    few_Det =  few_Det ;
@@ -42,7 +42,8 @@ incomplete concrete SwadeshI of Swadesh = open Lang in {
     in_Prep = Lang.in_Prep ;
     with_Prep = Lang.with_Prep ;
     -- Numerals
-    one_Det = Lang.DetSg one_Quant NoOrd ;
+    one_Det = Lang.DetPl IndefArt 
+      (Lang.NumNumeral (num (pot2as3 (pot1as2 (pot0as1 pot01))))) NoOrd ;
     two_Num = Lang.NumNumeral (num (pot2as3 (pot1as2 (pot0as1 (pot0 n2))))) ;
     three_Num = Lang.NumNumeral (num (pot2as3 (pot1as2 (pot0as1 (pot0 n3))))) ;
     four_Num = Lang.NumNumeral (num (pot2as3 (pot1as2 (pot0as1 (pot0 n4))))) ;
diff --git a/examples/uusisuomi/Makefile b/examples/uusisuomi/Makefile
index f5023537b..76fb3b684 100644
--- a/examples/uusisuomi/Makefile
+++ b/examples/uusisuomi/Makefile
@@ -1,6 +1,7 @@
 #LEX=Duodecim
 #LEX=Aino
-LEX=Omat
+#LEX=Omat
+LEX=NSSK
 
 all: tests
 
diff --git a/examples/uusisuomi/correct-NSK.txt b/examples/uusisuomi/correct-NSSK.txt
similarity index 100%
rename from examples/uusisuomi/correct-NSK.txt
rename to examples/uusisuomi/correct-NSSK.txt