From d8692184075fa34ccd5a690980f7f1baef92edfa Mon Sep 17 00:00:00 2001
From: aarne <aarne@cs.chalmers.se>
Date: Wed, 30 May 2007 19:29:24 +0000
Subject: [PATCH] further work on tutorial

---
 resource-1.0/finnish/CatFin.gf       | 32 ++++++++++++++++------------
 resource-1.0/finnish/GrammarFin.gf   |  2 +-
 resource-1.0/finnish/ParadigmsFin.gf |  3 +--
 resource-1.0/finnish/ResFin.gf       | 22 +++++++++++++++++++
 4 files changed, 42 insertions(+), 17 deletions(-)

diff --git a/resource-1.0/finnish/CatFin.gf b/resource-1.0/finnish/CatFin.gf
index c00d6589..bdded05b 100644
--- a/resource-1.0/finnish/CatFin.gf
+++ b/resource-1.0/finnish/CatFin.gf
@@ -1,4 +1,4 @@
-concrete CatFin of Cat = CommonX ** open ResFin, Prelude in {
+concrete CatFin of Cat = CommonX - [Adv] ** open ResFin, Prelude in {
 
   flags optimize=all_subs ;
 
@@ -70,24 +70,28 @@ concrete CatFin of Cat = CommonX ** open ResFin, Prelude in {
     Conj = {s : Str ; n : Number} ;
     DConj = {s1,s2 : Str ; n : Number} ;
     Subj = {s : Str} ;
-    Prep = Compl ;
 
 -- Open lexical classes, e.g. Lexicon
 
-    V, VS, VQ = Verb1 ; -- = {s : VForm => Str ; sc : Case} ;
-    V2, VA = Verb1 ** {c2 : Compl} ;
-    V2A = Verb1 ** {c2, c3 : Compl} ;
-    VV = Verb1 ; ---- infinitive form
-    V3 = Verb1 ** {c2, c3 : Compl} ;
+    V = ResFin.V ;
+    V2 = ResFin.V2 ;
+    VA = ResFin.VA ;
+    VS = ResFin.VS ;
+    VQ = ResFin.VQ ;
+    V2A = ResFin.V2A ;
+    VV = ResFin.VV ;
+    V3 = ResFin.V3 ;
 
-    A  = {s : Degree => AForm => Str} ;
-    A2 = {s : Degree => AForm => Str ; c2 : Compl} ;
+    A  = ResFin.A ;
+    A2 = ResFin.A2 ;
 
-    N  = {s : NForm => Str} ;
-    N2 = {s : NForm => Str} ** {c2 : Compl} ;
-    N3 = {s : NForm => Str} ** {c2,c3 : Compl} ;
-    PN = {s : Case  => Str} ;
+    N  = ResFin.N ;
+    N2 = ResFin.N2 ;
+    N3 = ResFin.N3 ;
+    PN = ResFin.PN ;
+
+    Adv = ResFin.Adv ;
+    Prep = ResFin.Prep ;
 
-oper Verb1 = {s : VForm => Str ; sc : NPForm} ;
 
 }
diff --git a/resource-1.0/finnish/GrammarFin.gf b/resource-1.0/finnish/GrammarFin.gf
index 6ae2ee9e..9ed42e3b 100644
--- a/resource-1.0/finnish/GrammarFin.gf
+++ b/resource-1.0/finnish/GrammarFin.gf
@@ -11,7 +11,7 @@ concrete GrammarFin of Grammar =
   RelativeFin,
   ConjunctionFin,
   PhraseFin,
-  TextX,
+  TextX - [Adv],
   IdiomFin,
   StructuralFin
   ** {
diff --git a/resource-1.0/finnish/ParadigmsFin.gf b/resource-1.0/finnish/ParadigmsFin.gf
index df83ed1f..55331f94 100644
--- a/resource-1.0/finnish/ParadigmsFin.gf
+++ b/resource-1.0/finnish/ParadigmsFin.gf
@@ -25,8 +25,7 @@
 resource ParadigmsFin = open 
   (Predef=Predef), 
   Prelude, 
-  MorphoFin,
-  CatFin
+  MorphoFin
   in {
 
   flags optimize=noexpand ;
diff --git a/resource-1.0/finnish/ResFin.gf b/resource-1.0/finnish/ResFin.gf
index 03d92dbe..a9f81764 100644
--- a/resource-1.0/finnish/ResFin.gf
+++ b/resource-1.0/finnish/ResFin.gf
@@ -569,4 +569,26 @@ oper
     a = agrP3 Sg ;  -- does not matter (--- at least in Slash)
     isPron = False  -- has no special accusative
     } ;
+
+-- To export
+
+    N : Type =  {s : NForm => Str} ;
+    N2 = {s : NForm => Str} ** {c2 : Compl} ;
+    N3 = {s : NForm => Str} ** {c2,c3 : Compl} ;
+    PN = {s : Case  => Str} ;
+
+    A  = {s : Degree => AForm => Str} ;
+    A2 = {s : Degree => AForm => Str ; c2 : Compl} ;
+
+    V, VS, VQ = Verb1 ; -- = {s : VForm => Str ; sc : Case} ;
+    V2, VA = Verb1 ** {c2 : Compl} ;
+    V2A = Verb1 ** {c2, c3 : Compl} ;
+    VV = Verb1 ; ---- infinitive form
+    V3 = Verb1 ** {c2, c3 : Compl} ;
+
+    Verb1 = {s : VForm => Str ; sc : NPForm} ;  
+
+    Prep = Compl ;
+    Adv = {s : Str} ;
+
 }