diff --git a/lib/resource-1.0/Makefile b/lib/resource-1.0/Makefile
index d6778ebb0..47bbc8cab 100644
--- a/lib/resource-1.0/Makefile
+++ b/lib/resource-1.0/Makefile
@@ -1,3 +1,11 @@
+test:
+ gf -src english/LangEng.gf swedish/LangSwe.gf german/TestGer.gf
+
+stat:
+ wc english/*.gfc
+ wc swedish/*.gfc
+ wc german/*.gfc
+
gfdoc:
gfdoc -txthtml abstract/*.gf
gfdoc -txthtml */Paradigms*.gf
diff --git a/lib/resource-1.0/abstract/Adjective.gf b/lib/resource-1.0/abstract/Adjective.gf
index 7cae616db..b97f37700 100644
--- a/lib/resource-1.0/abstract/Adjective.gf
+++ b/lib/resource-1.0/abstract/Adjective.gf
@@ -1,25 +1,30 @@
+--1 Adjectives and adjectival phrases
+
abstract Adjective = Cat ** {
fun
- PositA : A -> AP ;
- ComparA : A -> NP -> AP ;
+-- The principal ways of forming an adjectival phrase are
+-- positive, comparative, relational, reflexive-relational, and
+-- elliptic-relational.
+-- (The superlative use is covered in [Noun Noun.html].$SuperlA$.)
--- $SuperlA$ belongs to determiner syntax in $Noun$.
+ PositA : A -> AP ; -- warm
+ ComparA : A -> NP -> AP ; -- warmer than Spain
+ ComplA2 : A2 -> NP -> AP ; -- divisible by 2
+ ReflA2 : A2 -> AP ; -- divisible by itself
+ UseA2 : A2 -> A ; -- divisible
- ComplA2 : A2 -> NP -> AP ;
+-- Sentence and question complements defined for all adjectival
+-- phrases, although the semantics is only clear for some adjective.
+
+ SentAP : AP -> SC -> AP ; -- great that she won, uncertain if she did
- ReflA2 : A2 -> AP ;
+-- An adjectival phrase can be modified by an *adadjective*, such as "very".
- SentAP : AP -> S -> AP ;
- QuestAP : AP -> QS -> AP ;
+ AdAP : AdA -> AP -> AP ; -- very uncertain
- AdAP : AdA -> AP -> AP ;
-
--- $AdvA$ that forms adverbs belongs to $Adverb$.
-
--- Elliptic constructions as usual.
-
- UseA2 : A2 -> A ;
+-- The formation of adverbs from adjective (e.g. "quickly") is covered
+-- by [Adverb Adverb.html].
}
diff --git a/lib/resource-1.0/abstract/Adverb.gf b/lib/resource-1.0/abstract/Adverb.gf
index ead353f6a..9165d1c94 100644
--- a/lib/resource-1.0/abstract/Adverb.gf
+++ b/lib/resource-1.0/abstract/Adverb.gf
@@ -1,19 +1,34 @@
+--1 Adverbs and adverbial phrases
+
abstract Adverb = Cat ** {
fun
- PositAdvAdj : A -> Adv ;
- ComparAdvAdj : CAdv -> A -> NP -> Adv ;
- ComparAdvAdjS : CAdv -> A -> S -> Adv ;
+-- The two main ways of formins adverbs is from adjectives and by
+-- prepositions from noun phrases.
- PrepNP : Prep -> NP -> Adv ;
+ PositAdvAdj : A -> Adv ; -- quickly
+ PrepNP : Prep -> NP -> Adv ; -- in the house
- AdAdv : AdA -> Adv -> Adv ;
- SubjS : Subj -> S -> Adv ;
- AdvSC : SC -> Adv ;
+-- Comparative adverbs have a noun phrase or a sentence as object of
+-- comparison.
- AdnCAdv : CAdv -> AdN ;
+ ComparAdvAdj : CAdv -> A -> NP -> Adv ; -- more quickly than John
+ ComparAdvAdjS : CAdv -> A -> S -> Adv ; -- more quickly than he runs
+
+-- Adverbs can be modified by 'adadjectives', just like adjectives.
+
+ AdAdv : AdA -> Adv -> Adv ; -- very quickly
+
+-- Subordinate clauses can function as adverbs.
+
+ SubjS : Subj -> S -> Adv ; -- when he arrives
+ AdvSC : SC -> Adv ; ---- REMOVE THIS?
+
+-- Comparison adverbs also work as numeral adverbs.
+
+ AdnCAdv : CAdv -> AdN ; -- more (than five)
}
diff --git a/lib/resource-1.0/abstract/Noun.gf b/lib/resource-1.0/abstract/Noun.gf
index 14eb5698f..5e0a27a47 100644
--- a/lib/resource-1.0/abstract/Noun.gf
+++ b/lib/resource-1.0/abstract/Noun.gf
@@ -109,9 +109,8 @@ abstract Noun = Cat ** {
-- Nouns can also be modified by embedded sentences and questions.
-- For some nouns this makes little sense, but we leave this for applications
--- to decide.
+-- to decide. Sentential complements are defined in [Verb Verb.html].
- SentCN : CN -> S -> CN ; -- fact that John smokes
- QuestCN : CN -> QS -> CN ; -- question whether John smokes
+ SentCN : CN -> SC -> CN ; -- fact that John smokes, question if he does
} ;
diff --git a/lib/resource-1.0/doc/gfdoc/Adjective.html b/lib/resource-1.0/doc/gfdoc/Adjective.html
index b6a21f377..27a1da826 100644
--- a/lib/resource-1.0/doc/gfdoc/Adjective.html
+++ b/lib/resource-1.0/doc/gfdoc/Adjective.html
@@ -2,8 +2,12 @@
+ Adjectives and adjectival phrases
+ Adjectives and adjectival phrases
+Last update: Tue Jan 10 21:50:56 2006
+% NOTE: this is a txt2tags file.
@@ -13,51 +17,54 @@
-Author:
-Last update: Tue Jan 10 16:38:50 2006
-
-
Produced by
gfdoc - a rudimentary GF document generator.
(c) Aarne Ranta (aarne@cs.chalmers.se) 2002 under GNU GPL.
-
-==
-
abstract Adjective = Cat ** {
fun
-
- PositA : A -> AP ;
- ComparA : A -> NP -> AP ;
-SuperlA belongs to determiner syntax in Noun.
+The principal ways of forming an adjectival phrase are
+positive, comparative, relational, reflexive-relational, and
+elliptic-relational.
+(The superlative use is covered in Noun.SuperlA.)
- ComplA2 : A2 -> NP -> AP ;
-
- ReflA2 : A2 -> AP ;
-
- SentAP : AP -> S -> AP ;
- QuestAP : AP -> QS -> AP ;
-
- AdAP : AdA -> AP -> AP ;
+ PositA : A -> AP ; -- warm
+ ComparA : A -> NP -> AP ; -- warmer than Spain
+ ComplA2 : A2 -> NP -> AP ; -- divisible by 2
+ ReflA2 : A2 -> AP ; -- divisible by itself
+ UseA2 : A2 -> A ; -- divisible
-AdvA that forms adverbs belongs to Adverb.
-Elliptic constructions as usual.
+Sentence and question complements defined for all adjectival
+phrases, although the semantics is only clear for some adjective.
+
+
+ SentAP : AP -> SC -> AP ; -- great that she won, uncertain if she did
+
+
+
+An adjectival phrase can be modified by an adadjective, such as very.
+
+
+ AdAP : AdA -> AP -> AP ; -- very uncertain
+
+
+
+The formation of adverbs from adjective (e.g. quickly) is covered
+by Adverb.
- UseA2 : A2 -> A ;
-
}
-
+
diff --git a/lib/resource-1.0/doc/gfdoc/Adverb.html b/lib/resource-1.0/doc/gfdoc/Adverb.html
index 97f0d0031..e0ca9a551 100644
--- a/lib/resource-1.0/doc/gfdoc/Adverb.html
+++ b/lib/resource-1.0/doc/gfdoc/Adverb.html
@@ -2,8 +2,12 @@
+ Adverbs and adverbial phrases
+ Adverbs and adverbial phrases
+Last update: Tue Jan 10 21:50:56 2006
+% NOTE: this is a txt2tags file.
@@ -13,39 +17,59 @@
-Author:
-Last update: Tue Jan 10 16:38:50 2006
-
-
Produced by
gfdoc - a rudimentary GF document generator.
(c) Aarne Ranta (aarne@cs.chalmers.se) 2002 under GNU GPL.
-
-==
-
abstract Adverb = Cat ** {
fun
-
- PositAdvAdj : A -> Adv ;
- ComparAdvAdj : CAdv -> A -> NP -> Adv ;
- ComparAdvAdjS : CAdv -> A -> S -> Adv ;
-
- PrepNP : Prep -> NP -> Adv ;
-
- AdAdv : AdA -> Adv -> Adv ;
-
- SubjS : Subj -> S -> Adv ;
- AdvSC : SC -> Adv ;
-
- AdnCAdv : CAdv -> AdN ;
+
+
+
+The two main ways of formins adverbs is from adjectives and by
+prepositions from noun phrases.
+
+
+ PositAdvAdj : A -> Adv ; -- quickly
+ PrepNP : Prep -> NP -> Adv ; -- in the house
+
+
+
+Comparative adverbs have a noun phrase or a sentence as object of
+comparison.
+
+
+ ComparAdvAdj : CAdv -> A -> NP -> Adv ; -- more quickly than John
+ ComparAdvAdjS : CAdv -> A -> S -> Adv ; -- more quickly than he runs
+
+
+
+Adverbs can be modified by 'adadjectives', just like adjectives.
+
+
+ AdAdv : AdA -> Adv -> Adv ; -- very quickly
+
+
+
+Subordinate clauses can function as adverbs.
+
+
+ SubjS : Subj -> S -> Adv ; -- when he arrives
+ AdvSC : SC -> Adv ; ---- REMOVE THIS?
+
+
+
+Comparison adverbs also work as numeral adverbs.
+
+
+ AdnCAdv : CAdv -> AdN ; -- more (than five)
}
-
+
diff --git a/lib/resource-1.0/doc/gfdoc/Basic.html b/lib/resource-1.0/doc/gfdoc/Basic.html
index 2dac04153..779044642 100644
--- a/lib/resource-1.0/doc/gfdoc/Basic.html
+++ b/lib/resource-1.0/doc/gfdoc/Basic.html
@@ -13,17 +13,13 @@
-Author:
-Last update: Tue Jan 10 16:38:50 2006
+Last update: Tue Jan 10 21:50:56 2006
Produced by
gfdoc - a rudimentary GF document generator.
(c) Aarne Ranta (aarne@cs.chalmers.se) 2002 under GNU GPL.
-
-==
-
abstract Basic = Cat ** {
fun
@@ -251,6 +247,6 @@ gfdoc - a rudimentary GF document generator.
-
+