bronzeage

9 files changed, 18 insertions, 9 deletions

diff --git a/examples/stoneage1/StoneageEng.gf b/examples/stoneage1/StoneageEng.gf
index cc8de20a0..2d2a166f5 100644
--- a/examples/stoneage1/StoneageEng.gf
+++ b/examples/stoneage1/StoneageEng.gf
@@ -1,6 +1,6 @@
 --# -path=.:compiled:prelude:resource-1.0/swadesh
 
 concrete StoneageEng of Stoneage = StoneageI with
-  (Lang = LangEng),
+  (Mathematical = MathematicalEng),
   (Swadesh = SwadeshEng) ;
 
diff --git a/examples/stoneage1/StoneageFin.gf b/examples/stoneage1/StoneageFin.gf
index 6efe406b7..6a7763bc7 100644
--- a/examples/stoneage1/StoneageFin.gf
+++ b/examples/stoneage1/StoneageFin.gf
@@ -1,6 +1,6 @@
 --# -path=.:compiled:resource-1.0/swadesh
 
 concrete StoneageFin of Stoneage = StoneageI with
-  (Lang = LangFin),
+  (Mathematical = MathematicalFin),
   (Swadesh = SwadeshFin) ;
 
diff --git a/examples/stoneage1/StoneageFre.gf b/examples/stoneage1/StoneageFre.gf
index 8f6986022..dcd310826 100644
--- a/examples/stoneage1/StoneageFre.gf
+++ b/examples/stoneage1/StoneageFre.gf
@@ -1,6 +1,6 @@
 --# -path=.:compiled:prelude:resource-1.0/swadesh
 
 concrete StoneageFre of Stoneage = StoneageI with
-  (Lang = LangFre),
+  (Mathematical = MathematicalFre),
   (Swadesh = SwadeshFre) ;
 
diff --git a/examples/stoneage1/StoneageGer.gf b/examples/stoneage1/StoneageGer.gf
index f13b731d5..b7a896770 100644
--- a/examples/stoneage1/StoneageGer.gf
+++ b/examples/stoneage1/StoneageGer.gf
@@ -1,6 +1,6 @@
 --# -path=.:compiled:resource-1.0/swadesh
 
 concrete StoneageGer of Stoneage = StoneageI with
-  (Lang = LangGer),
+  (Mathematical = MathematicalGer),
   (Swadesh = SwadeshGer) ;
 
diff --git a/examples/stoneage1/StoneageI.gf b/examples/stoneage1/StoneageI.gf
index 392fc6ebf..50a76c9e4 100644
--- a/examples/stoneage1/StoneageI.gf
+++ b/examples/stoneage1/StoneageI.gf
@@ -1,4 +1,4 @@
-incomplete concrete StoneageI of Stoneage = open Lang, Swadesh in { 
+incomplete concrete StoneageI of Stoneage = open Mathematical, Swadesh in { 
 
 flags
   startcat=S ;
@@ -230,6 +230,14 @@ lin
 oper
 
   PresV : V -> NP -> Phr = \v,s -> 
+    PhrUtt NoPConj (UttS (PosCl (predV v s))) NoVoc ;
+  PresV2 : V2 -> NP -> NP -> Phr = \v,s,o -> 
+    PhrUtt NoPConj (UttS (PosCl (predV2 v s o))) NoVoc ;
+  PresV3 : V3 -> NP -> NP -> NP -> Phr = \v,s,o,r -> 
+    PhrUtt NoPConj (UttS (PosCl (predV3 v s o r))) NoVoc ;
+
+{-
+  PresV : V -> NP -> Phr = \v,s -> 
     PhrUtt NoPConj (UttS (UseCl TPres ASimul PPos 
       (PredVP s (UseV v)))) NoVoc ;
   PresV2 : V2 -> NP -> NP -> Phr = \v,s,o -> 
@@ -238,6 +246,7 @@ oper
   PresV3 : V3 -> NP -> NP -> NP -> Phr = \v,s,o,r -> 
     PhrUtt NoPConj (UttS (UseCl TPres ASimul PPos 
       (PredVP s (ComplV3 v o r)))) NoVoc ;
+-}
 
   ModA : A -> CN -> CN = \a ->
     AdjCN (PositA a) ;
diff --git a/examples/stoneage1/StoneageIta.gf b/examples/stoneage1/StoneageIta.gf
index 8d0b7e4e9..8cf815f15 100644
--- a/examples/stoneage1/StoneageIta.gf
+++ b/examples/stoneage1/StoneageIta.gf
@@ -1,6 +1,6 @@
 --# -path=.:compiled:prelude:resource-1.0/swadesh
 
 concrete StoneageIta of Stoneage = StoneageI with
-  (Lang = LangIta),
+  (Mathematical = MathematicalIta),
   (Swadesh = SwadeshIta) ;
 
diff --git a/examples/stoneage1/StoneageNor.gf b/examples/stoneage1/StoneageNor.gf
index ec0f54ce8..86a88f995 100644
--- a/examples/stoneage1/StoneageNor.gf
+++ b/examples/stoneage1/StoneageNor.gf
@@ -1,6 +1,6 @@
 --# -path=.:compiled:prelude:resource-1.0/swadesh
 
 concrete StoneageNor of Stoneage = StoneageI with
-  (Lang = LangNor),
+  (Mathematical = MathematicalNor),
   (Swadesh = SwadeshNor) ;
 
diff --git a/examples/stoneage1/StoneageSpa.gf b/examples/stoneage1/StoneageSpa.gf
index 3f8b908b6..73cb60e21 100644
--- a/examples/stoneage1/StoneageSpa.gf
+++ b/examples/stoneage1/StoneageSpa.gf
@@ -1,6 +1,6 @@
 --# -path=.:compiled:prelude:resource-1.0/swadesh
 
 concrete StoneageSpa of Stoneage = StoneageI with
-  (Lang = LangSpa),
+  (Mathematical = MathematicalSpa),
   (Swadesh = SwadeshSpa) ;
 
diff --git a/examples/stoneage1/StoneageSwe.gf b/examples/stoneage1/StoneageSwe.gf
index 376c34896..b8383ba8e 100644
--- a/examples/stoneage1/StoneageSwe.gf
+++ b/examples/stoneage1/StoneageSwe.gf
@@ -1,6 +1,6 @@
 --# -path=.:compiled:prelude:resource-1.0/swadesh
 
 concrete StoneageSwe of Stoneage = StoneageI with
-  (Lang = LangSwe),
+  (Mathematical = MathematicalSwe),
   (Swadesh = SwadeshSwe) ;