redocumenting resource

lib/resource-1.0/abstract/Cat.gf

@@ -1,6 +1,6 @@
 --1 The category system
 
-abstract Cat = {
+abstract Cat = Tense ** {
 
   cat
 
@@ -13,19 +13,13 @@ abstract Cat = {
     Utt ;   -- sentence, question, word...         e.g. "be quiet"
     Voc ;   -- vocative or "please"                e.g. "my darling"
 
---2 Tensed sentences
+--2 Sentences and clauses
 
--- Constructed in [Tensed Tensed.html].
--- A simplified variant, with just present forms, is [Untensed Untensed.html].
+-- Constructed in [Sentence Sentence.html].
 
     S ;     -- declarative sentence                e.g. "she lived here"
     QS ;    -- question                            e.g. "where did she live"
     RS ;    -- relative                            e.g. "in which she lived"
-
---2 Clauses
-
--- Constructed in [Sentence Sentence.html].
-
     Cl ;    -- declarative clause, with all tenses e.g. "she looks at this"
     Slash ; -- clause missing NP (S/NP in GPSG)    e.g. "she looks at"
     Imp ;   -- imperative                          e.g. "look at this"
@@ -108,7 +102,7 @@ abstract Cat = {
 
 --2 Words of open classes
 
--- These are constructed in [Basic Basic.html] and in additional lexicon modules.
+-- These are constructed in [Lexicon Lexicon.html] and in additional lexicon modules.
 
     V ;     -- one-place verb                      e.g. "sleep" 
     V2 ;    -- two-place verb                      e.g. "love"

lib/resource-1.0/abstract/Lang.gf

@@ -15,7 +15,6 @@ abstract Lang =
   Relative,
   Conjunction,
   Phrase,
-  Tensed,
   Structural,
-  Basic
+  Lexicon
   ** {} ;

lib/resource-1.0/abstract/Lexicon.gf

@@ -1,4 +1,4 @@
---1 A Basic Lexicon
+--1 A Lexicon Lexicon
 
 -- This files gives a list of words whose purpose is to test the GF
 -- resource grammar. It covers all lexical categories of [Cat Cat.html].
@@ -10,7 +10,7 @@
 -- of the words in different languages are not guaranteed to be translation
 -- equivalents.
 
-abstract Basic = Cat ** {
+abstract Lexicon = Cat ** {
   fun
   add_V3 : V3 ;
   airplane_N : N ;

lib/resource-1.0/abstract/Phrase.gf

@@ -1,6 +1,6 @@
 --1 Phrases and utterances
 
-abstract Phrase = Cat, Tense ** {
+abstract Phrase = Cat ** {
 
 -- When a phrase is built from an utterance it can be prefixed
 -- with a phrasal conjunction (such as "but", "therefore")

lib/resource-1.0/abstract/Sentence.gf

@@ -1,4 +1,4 @@
---1 Clauses, imperatives, and sentential complements
+--1 Sentences, clauses, imperatives, and sentential complements
 
 abstract Sentence = Cat ** {
 
@@ -49,5 +49,35 @@ abstract Sentence = Cat ** {
     EmbedQS   : QS -> SC ;               -- whether you go
     EmbedVP   : VP -> SC ;               -- to go
 
+--2 Sentences
+
+-- These are the 2 x 4 x 4 = 16 forms generated by different
+-- combinations of tense, polarity, and
+-- anteriority, which are defined in [Tense Tense.html].
+
+  fun
+    UseCl  : Tense -> Ant -> Pol -> Cl  -> S ;
+    UseQCl : Tense -> Ant -> Pol -> QCl -> QS ;
+    UseRCl : Tense -> Ant -> Pol -> RCl -> RS ;
 
 }
+
+-- Examples for English $S$/$Cl$:
+{-
+  Pres  Simul  Pos  ODir  : he sleeps
+  Pres  Simul  Neg  ODir  : he doesn't sleep
+  Pres  Anter  Pos  ODir  : he has slept
+  Pres  Anter  Neg  ODir  : he hasn't slept
+  Past  Simul  Pos  ODir  : he slept
+  Past  Simul  Neg  ODir  : he didn't sleep
+  Past  Anter  Pos  ODir  : he had slept
+  Past  Anter  Neg  ODir  : he hadn't slept
+  Fut   Simul  Pos  ODir  : he will sleep
+  Fut   Simul  Neg  ODir  : he won't sleep
+  Fut   Anter  Pos  ODir  : he will have slept
+  Fut   Anter  Neg  ODir  : he won't have slept
+  Cond  Simul  Pos  ODir  : he would sleep
+  Cond  Simul  Neg  ODir  : he wouldn't sleep
+  Cond  Anter  Pos  ODir  : he would have slept
+  Cond  Anter  Neg  ODir  : he wouldn't have slept
+-}

lib/resource-1.0/abstract/Tensed.gf

@@ -1,36 +0,0 @@
---1 Tensed forms of sentences, questions, and relative clauses
-
--- This module defines the 2 x 4 x 4 = 16 forms generated by different
--- combinations of tense, polarity, and
--- anteriority, which are defined in [Tense Tense.html].
--- A variant with just the polarity variation is given in
--- [Untensed Untensed.html].
-
-abstract Tensed = Cat, Tense ** {
-
-  fun
-    UseCl  : Tense -> Ant -> Pol -> Cl  -> S ;
-    UseQCl : Tense -> Ant -> Pol -> QCl -> QS ;
-    UseRCl : Tense -> Ant -> Pol -> RCl -> RS ;
-
-}
-
--- Examples for English $S$:
-{-
-  Pres  Simul  Pos  ODir  : he sleeps
-  Pres  Simul  Neg  ODir  : he doesn't sleep
-  Pres  Anter  Pos  ODir  : he has slept
-  Pres  Anter  Neg  ODir  : he hasn't slept
-  Past  Simul  Pos  ODir  : he slept
-  Past  Simul  Neg  ODir  : he didn't sleep
-  Past  Anter  Pos  ODir  : he had slept
-  Past  Anter  Neg  ODir  : he hadn't slept
-  Fut   Simul  Pos  ODir  : he will sleep
-  Fut   Simul  Neg  ODir  : he won't sleep
-  Fut   Anter  Pos  ODir  : he will have slept
-  Fut   Anter  Neg  ODir  : he won't have slept
-  Cond  Simul  Pos  ODir  : he would sleep
-  Cond  Simul  Neg  ODir  : he wouldn't sleep
-  Cond  Anter  Pos  ODir  : he would have slept
-  Cond  Anter  Neg  ODir  : he wouldn't have slept
--}