From 6b6c25e5cba412c3f8dd1485a4c4e047406c1ddc Mon Sep 17 00:00:00 2001
From: aarne <aarne@cs.chalmers.se>
Date: Thu, 10 May 2007 13:49:26 +0000
Subject: [PATCH] modernized and completed Minimal for absbnf testing

---
 lib/resource-1.0/minimal/MinLexicon.gf    |  5 ++++-
 lib/resource-1.0/minimal/MinLexiconEng.gf |  2 +-
 lib/resource-1.0/minimal/MinLexiconI.gf   |  4 +++-
 lib/resource-1.0/minimal/Minimal.gf       | 14 +-------------
 lib/resource-1.0/minimal/MinimalEng.gf    | 16 ++--------------
 5 files changed, 11 insertions(+), 30 deletions(-)

diff --git a/lib/resource-1.0/minimal/MinLexicon.gf b/lib/resource-1.0/minimal/MinLexicon.gf
index 16954a549..5a1544298 100644
--- a/lib/resource-1.0/minimal/MinLexicon.gf
+++ b/lib/resource-1.0/minimal/MinLexicon.gf
@@ -6,8 +6,11 @@ abstract MinLexicon = Cat ** {
   big_A : A ;
   break_V2 : V2 ;
   brother_N2 : N2 ;
+  distance_N3 : N3 ;
+  married_A2 : A2 ;
   paint_V2A : V2A ;
---  paris_PN : PN ;
+  paris_PN : PN ;
+  say_VS : VS ;
   sleep_V : V ;
   wonder_VQ : VQ ;
 
diff --git a/lib/resource-1.0/minimal/MinLexiconEng.gf b/lib/resource-1.0/minimal/MinLexiconEng.gf
index c922c309b..0233f660c 100644
--- a/lib/resource-1.0/minimal/MinLexiconEng.gf
+++ b/lib/resource-1.0/minimal/MinLexiconEng.gf
@@ -1,2 +1,2 @@
-concrete MinLexiconEng of MinLexicon = MinLexiconI with
+concrete MinLexiconEng of MinLexicon = CatEng ** MinLexiconI with
   (Lexicon = LexiconEng) ;
diff --git a/lib/resource-1.0/minimal/MinLexiconI.gf b/lib/resource-1.0/minimal/MinLexiconI.gf
index 47763062d..c3e9209a6 100644
--- a/lib/resource-1.0/minimal/MinLexiconI.gf
+++ b/lib/resource-1.0/minimal/MinLexiconI.gf
@@ -8,8 +8,10 @@ incomplete concrete MinLexiconI of MinLexicon = Cat ** open Lexicon in {
   big_A = big_A ;
   break_V2 = break_V2 ;
   brother_N2 = brother_N2 ;
+  distance_N3 = distance_N3 ;
+  married_A2 = married_A2 ;
   paint_V2A = paint_V2A ;
---  paris_PN = paris_PN ;
+  paris_PN = paris_PN ;
   say_VS = say_VS ;
   sleep_V = sleep_V ;
   wonder_VQ = wonder_VQ ;
diff --git a/lib/resource-1.0/minimal/Minimal.gf b/lib/resource-1.0/minimal/Minimal.gf
index 1390ffe59..88e53dfc0 100644
--- a/lib/resource-1.0/minimal/Minimal.gf
+++ b/lib/resource-1.0/minimal/Minimal.gf
@@ -4,18 +4,6 @@
 -- This is useful for treebank generation.
 
 abstract Minimal = 
-  Noun,
-  Verb, 
-  Adjective,
-  Adverb,
-  Numeral,
-  Sentence, 
-  Question,
-  Relative,
-  Conjunction,
-  Phrase,
-  Text,
-  MinStructural,
-  Idiom,
+  Grammar,
   MinLexicon
   ** {} ;
diff --git a/lib/resource-1.0/minimal/MinimalEng.gf b/lib/resource-1.0/minimal/MinimalEng.gf
index 7499ad927..0234327fa 100644
--- a/lib/resource-1.0/minimal/MinimalEng.gf
+++ b/lib/resource-1.0/minimal/MinimalEng.gf
@@ -1,20 +1,8 @@
 --# -path=.:../english:../abstract:../common:prelude
 
 concrete MinimalEng of Minimal = 
-  NounEng, 
-  VerbEng, 
-  AdjectiveEng,
-  AdverbEng,
-  NumeralEng,
-  SentenceEng,
-  QuestionEng,
-  RelativeEng,
-  ConjunctionEng,
-  PhraseEng,
-  TextX,
-  StructuralEng,
-  IdiomEng,
-  LexiconEng
+  GrammarEng,
+  MinLexiconEng
   ** {
 
 flags startcat = Phr ; -- unlexer = text ; lexer = text ;