cleaned up in multimodal and dialogue

2026-04-11 13:59:31 -06:00 · 2006-05-24 16:51:52 +00:00
parent 674e0c95af
commit f99576264f
72 changed files with 762 additions and 409 deletions
--- a/examples/dialogue/AgendaEng.gf
+++ b/examples/dialogue/AgendaEng.gf
@@ -1,7 +1,7 @@
--# -path=.:present:prelude
+--# -path=.:multimodal:alltenses:prelude

 concrete AgendaEng of Agenda = 
-  DialogueEng, WeekdayEng ** open LangEng, ParadigmsEng in {
+  DialogueEng, WeekdayEng ** open MultiEng, ParadigmsEng in {

  lin
    Day       = UseN (regN "day") ;
--- a/examples/dialogue/AgendaFin.gf
+++ b/examples/dialogue/AgendaFin.gf
@@ -1,7 +1,7 @@
--# -path=.:present:prelude
+--# -path=.:multimodal:alltenses:prelude

 concrete AgendaFin of Agenda = 
-  DialogueFin, WeekdayFin ** open LangFin, ParadigmsFin in {
+  DialogueFin, WeekdayFin ** open MultiFin, ParadigmsFin in {

  lin
    Day       = UseN (regN "päivä") ;
--- a/examples/dialogue/AgendaFre.gf
+++ b/examples/dialogue/AgendaFre.gf
@@ -1,7 +1,7 @@
--# -path=.:present:prelude
+--# -path=.:multimodal:alltenses:prelude

 concrete AgendaFre of Agenda = 
-  DialogueFre, WeekdayFre ** open LangFre, ParadigmsFre, IrregFre in {
+  DialogueFre, WeekdayFre ** open MultiFre, ParadigmsFre, IrregFre in {

  lin
    Day       = UseN (regN "jour") ;
--- a/examples/dialogue/AgendaSwe.gf
+++ b/examples/dialogue/AgendaSwe.gf
@@ -1,7 +1,7 @@
--# -path=.:present:prelude
+--# -path=.:multimodal:alltenses:prelude

 concrete AgendaSwe of Agenda = 
-  DialogueSwe, WeekdaySwe ** open LangSwe, ParadigmsSwe, IrregSwe in {
+  DialogueSwe, WeekdaySwe ** open MultiSwe, ParadigmsSwe, IrregSwe in {

  lin
    Day       = UseN (regN "dag") ;
--- a/examples/dialogue/AuxFin.gf
+++ b/examples/dialogue/AuxFin.gf
@@ -1,2 +1,2 @@
-instance AuxFin of AuxDialogue = open LangFin in {
+instance AuxFin of AuxDialogue = open MultiFin in {
 }
--- a/examples/dialogue/AuxFre.gf
+++ b/examples/dialogue/AuxFre.gf
@@ -1,2 +1,2 @@
-instance AuxFre of AuxDialogue = open LangFre in {
+instance AuxFre of AuxDialogue = open MultiFre in {
 }
--- a/examples/dialogue/AuxSwe.gf
+++ b/examples/dialogue/AuxSwe.gf
@@ -1,2 +1,2 @@
-instance AuxSwe of AuxDialogue = open LangSwe in {
-}
+instance AuxSwe of AuxDialogue = open MultiSwe in {
+}
--- a/examples/dialogue/DialogueFin.gf
+++ b/examples/dialogue/DialogueFin.gf
@@ -1,4 +1,4 @@
--# -path=.:present:prelude
+--# -path=.:multimodal:alltenses:prelude

 concrete DialogueFin of Dialogue = DialogueI with 
-  (Lang = LangFin) ;
+  (Multi = MultiFin) ;
--- a/examples/dialogue/DialogueFre.gf
+++ b/examples/dialogue/DialogueFre.gf
@@ -1,4 +1,4 @@
--# -path=.:present:prelude
+--# -path=.:multimodal:alltenses:prelude

 concrete DialogueFre of Dialogue = DialogueI with 
-  (Lang = LangFre) ;
+  (Multi = MultiFre) ;
--- a/examples/dialogue/DialogueI.gf
+++ b/examples/dialogue/DialogueI.gf
@@ -1,5 +1,7 @@
 incomplete concrete DialogueI of Dialogue = open Multi, Prelude in {

+  flags optimize = all_subs ;
+
  lincat
    Move   = Phr ;
    Action = {s : ActType => Str ; point : Str} ;
--- a/examples/dialogue/DialogueSwe.gf
+++ b/examples/dialogue/DialogueSwe.gf
@@ -1,4 +1,4 @@
--# -path=.:present:prelude
+--# -path=.:multimodal:alltenses:prelude

 concrete DialogueSwe of Dialogue = DialogueI with 
-  (Lang = LangSwe) ;
+  (Multi = MultiSwe) ;
--- a/examples/dialogue/LightsFin.gf
+++ b/examples/dialogue/LightsFin.gf
@@ -1,7 +1,7 @@
--# -path=.:present:prelude
+--# -path=.:multimodal:alltenses:prelude

 concrete LightsFin of Lights = 
-  DialogueFin ** open LangFin, ParadigmsFin, AuxFin in {
+  DialogueFin ** open MultiFin, ParadigmsFin, AuxFin in {

  lin
    Light       = UseN (regN "valo") ;
--- a/examples/dialogue/LightsFre.gf
+++ b/examples/dialogue/LightsFre.gf
@@ -1,7 +1,7 @@
--# -path=.:present:prelude
+--# -path=.:multimodal:alltenses:prelude

 concrete LightsFre of Lights = 
-  DialogueFre ** open LangFre, ParadigmsFre, IrregFre, AuxFre in {
+  DialogueFre ** open MultiFre, ParadigmsFre, IrregFre, AuxFre in {

  lin
    Light       = UseN (regN "lampe") ;
--- a/examples/dialogue/LightsSwe.gf
+++ b/examples/dialogue/LightsSwe.gf
@@ -1,7 +1,8 @@
--# -path=.:present:prelude
+--# -path=.:multimodal:alltenses:prelude
+

 concrete LightsSwe of Lights = 
-  DialogueSwe ** open LangSwe, ParadigmsSwe, AuxSwe in {
+  DialogueSwe ** open MultiSwe, ParadigmsSwe, AuxSwe in {

  lin
    Light       = UseN (regN "lampa") ;
--- a/examples/dialogue/README.txt
+++ b/examples/dialogue/README.txt
@@ -2,6 +2,9 @@ Dialogue system grammars using GF resource.

 AR 16/5/2006

+
+24/5 Added multimodality.
+
 ==Functionality and purpose==

 Dialogue system abstract syntax + concrete syntaxes for
--- a/lib/resource-1.0/Makefile
+++ b/lib/resource-1.0/Makefile
@@ -2,7 +2,7 @@ GF=../../bin/gf

 .PHONY: show-path all test pretest langs present mathematical multimodal compiled treebank stat gfdoc clean

-all: show-path present mathematical multimodal langs compiled
+all: show-path langs multimodal present mathematical compiled

 show-path:
 	@echo GF_LIB_PATH=$(GF_LIB_PATH)
@@ -27,7 +27,7 @@ mathematical:
 	mv mathematical/*.gfc ../mathematical

 multimodal:
-	$(GF) -make -nocf -preproc=./mkPresent multimodal/Multimodal???.gf
+	$(GF) -make -nocf multimodal/Multi???.gf
 	mv multimodal/*.gfc multimodal/*.gfr ../multimodal

 compiled:
@@ -45,8 +45,7 @@ gfdoc:
 	gfdoc -txthtml mathematical/Mathematical.gf
 	gfdoc -txthtml mathematical/Symbol.gf
 	gfdoc -txthtml mathematical/Predication.gf
-	gfdoc -txthtml multimodal/Demonstrative.gf
-	gfdoc -txthtml multimodal/Multimodal.gf
+	gfdoc -txthtml multimodal/Multi.gf
 	gfdoc -txthtml ../prelude/*.gf
 	mv abstract/*.html doc/gfdoc
 	mv mathematical/*.html doc/gfdoc
--- a/lib/resource-1.0/common/CommonX.gf
+++ b/lib/resource-1.0/common/CommonX.gf
@@ -1,19 +1,19 @@
 concrete CommonX of Common = open (R = ParamX) in {

  lincat
-    Text = {s : Str ; lock_Text : {}} ;
-    Phr = {s : Str ; lock_Phr : {}} ;
-    Utt = {s : Str ; lock_Utt : {}} ;
-    Voc = {s : Str ; lock_Voc : {}} ;
-    SC  = {s : Str ; lock_SC : {}} ;
-    Adv = {s : Str ; lock_Adv : {}} ;
-    AdV = {s : Str ; lock_AdV : {}} ;
-    AdA = {s : Str ; lock_AdA : {}} ;
-    AdS = {s : Str ; lock_AdS : {}} ;
-    AdN = {s : Str ; lock_AdN : {}} ;
-    IAdv = {s : Str ; lock_IAdv : {}} ;
-    CAdv = {s : Str ; lock_CAdv : {}} ;
-    PConj = {s : Str ; lock_PConj : {}} ;
+    Text = {s : Str} ; --lock_Text : {}} ;
+    Phr = {s : Str} ; --lock_Phr : {}} ;
+    Utt = {s : Str} ; --lock_Utt : {}} ;
+    Voc = {s : Str} ; --lock_Voc : {}} ;
+    SC  = {s : Str} ; --lock_SC : {}} ;
+    Adv = {s : Str} ; --lock_Adv : {}} ;
+    AdV = {s : Str} ; --lock_AdV : {}} ;
+    AdA = {s : Str} ; --lock_AdA : {}} ;
+    AdS = {s : Str} ; --lock_AdS : {}} ;
+    AdN = {s : Str} ; --lock_AdN : {}} ;
+    IAdv = {s : Str} ; --lock_IAdv : {}} ;
+    CAdv = {s : Str} ; --lock_CAdv : {}} ;
+    PConj = {s : Str} ; --lock_PConj : {}} ;

    Tense = {s : Str ; t : R.Tense} ;
    Ant   = {s : Str ; a : R.Anteriority} ;
--- a/lib/resource-1.0/doc/gfdoc/Adjective.html
+++ b/lib/resource-1.0/doc/gfdoc/Adjective.html
@@ -6,12 +6,17 @@
 </HEAD><BODY BGCOLOR="white" TEXT="black">
 <P ALIGN="center"><CENTER><H1> Adjectives and adjectival phrases</H1>
 <FONT SIZE="4">
-<I>Last update: 2006-01-10 20:56:21 CET</I><BR>
+<I>Author: </I><BR>
+Last update: Wed May 24 18:29:10 2006
 </FONT></CENTER>

 <P></P>
 <HR NOSHADE SIZE=1>
 <P></P>
+  <UL>
+  <LI><A HREF="#toc1">Adjectives and adjectival phrases</A>
+  </UL>
+
 <P></P>
 <HR NOSHADE SIZE=1>
 <P></P>
@@ -20,6 +25,8 @@ Produced by
 gfdoc - a rudimentary GF document generator.
 (c) Aarne Ranta (<A HREF="mailto:aarne@cs.chalmers.se">aarne@cs.chalmers.se</A>) 2002 under GNU GPL.
 </P>
+<A NAME="toc1"></A>
+<H1>Adjectives and adjectival phrases</H1>
 <PRE>
    abstract Adjective = Cat ** {
    
--- a/lib/resource-1.0/doc/gfdoc/Adverb.html
+++ b/lib/resource-1.0/doc/gfdoc/Adverb.html
@@ -6,12 +6,17 @@
 </HEAD><BODY BGCOLOR="white" TEXT="black">
 <P ALIGN="center"><CENTER><H1> Adverbs and adverbial phrases</H1>
 <FONT SIZE="4">
-<I>Last update: 2006-01-13 16:54:40 CET</I><BR>
+<I>Author: </I><BR>
+Last update: Wed May 24 18:29:10 2006
 </FONT></CENTER>

 <P></P>
 <HR NOSHADE SIZE=1>
 <P></P>
+  <UL>
+  <LI><A HREF="#toc1">Adverbs and adverbial phrases</A>
+  </UL>
+
 <P></P>
 <HR NOSHADE SIZE=1>
 <P></P>
@@ -20,6 +25,8 @@ Produced by
 gfdoc - a rudimentary GF document generator.
 (c) Aarne Ranta (<A HREF="mailto:aarne@cs.chalmers.se">aarne@cs.chalmers.se</A>) 2002 under GNU GPL.
 </P>
+<A NAME="toc1"></A>
+<H1>Adverbs and adverbial phrases</H1>
 <PRE>
    abstract Adverb = Cat ** {
    
@@ -27,7 +34,7 @@ gfdoc - a rudimentary GF document generator.
 </PRE>
 <P></P>
 <P>
-The two main ways of formins adverbs is from adjectives and by
+The two main ways of forming adverbs are from adjectives and by
 prepositions from noun phrases.
 </P>
 <PRE>
--- a/lib/resource-1.0/doc/gfdoc/Cat.html
+++ b/lib/resource-1.0/doc/gfdoc/Cat.html
@@ -6,25 +6,27 @@
 </HEAD><BODY BGCOLOR="white" TEXT="black">
 <P ALIGN="center"><CENTER><H1> The category system</H1>
 <FONT SIZE="4">
-<I>Last update: 2006-04-20 21:45:11 CEST</I><BR>
+<I>Author: </I><BR>
+Last update: Wed May 24 18:29:11 2006
 </FONT></CENTER>

 <P></P>
 <HR NOSHADE SIZE=1>
 <P></P>
+  <UL>
+  <LI><A HREF="#toc1">The category system</A>
    <UL>
-    <LI><A HREF="#toc1">Top-level units</A>
    <LI><A HREF="#toc2">Sentences and clauses</A>
    <LI><A HREF="#toc3">Questions and interrogatives</A>
    <LI><A HREF="#toc4">Relative clauses and pronouns</A>
    <LI><A HREF="#toc5">Verb phrases</A>
    <LI><A HREF="#toc6">Adjectival phrases</A>
    <LI><A HREF="#toc7">Nouns and noun phrases</A>
-    <LI><A HREF="#toc8">Adverbs</A>
-    <LI><A HREF="#toc9">Numerals</A>
-    <LI><A HREF="#toc10">Structural words</A>
-    <LI><A HREF="#toc11">Words of open classes</A>
+    <LI><A HREF="#toc8">Numerals</A>
+    <LI><A HREF="#toc9">Structural words</A>
+    <LI><A HREF="#toc10">Words of open classes</A>
    </UL>
+  </UL>

 <P></P>
 <HR NOSHADE SIZE=1>
@@ -34,6 +36,8 @@ Produced by
 gfdoc - a rudimentary GF document generator.
 (c) Aarne Ranta (<A HREF="mailto:aarne@cs.chalmers.se">aarne@cs.chalmers.se</A>) 2002 under GNU GPL.
 </P>
+<A NAME="toc1"></A>
+<H1>The category system</H1>
 <P>
 Some categories are inherited from <A HREF="Common.html">Common</A>.
 </P>
@@ -43,17 +47,6 @@ Some categories are inherited from <A HREF="Common.html">Common</A>.
      cat
 </PRE>
 <P></P>
-<A NAME="toc1"></A>
-<H2>Top-level units</H2>
-<P>
-Constructed in <A HREF="Text.html">Text</A>: <CODE>Text</CODE>.
-Constructed in <A HREF="Phrase.html">Phrase</A>: <CODE>Phr</CODE> and
-</P>
-<PRE>
-        Utt ;   -- sentence, question, word...         e.g. "be quiet"
-        Voc ;   -- vocative or "please"                e.g. "my darling"
-</PRE>
-<P></P>
 <A NAME="toc2"></A>
 <H2>Sentences and clauses</H2>
 <P>
@@ -67,7 +60,6 @@ Constructed in <A HREF="Sentence.html">Sentence</A>, and also in
        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"
-        SC ;    -- embedded sentence or question       e.g. "that it rains"
 </PRE>
 <P></P>
 <A NAME="toc3"></A>
@@ -78,7 +70,6 @@ Constructed in <A HREF="Question.html">Question</A>.
 <PRE>
        QCl ;   -- question clause, with all tenses    e.g. "why does she walk"
        IP ;    -- interrogative pronoun               e.g. "who"
-        IAdv ;  -- interrogative adverb                e.g. "why"
        IComp ; -- interrogative complement of copula  e.g. "where"
        IDet ;  -- interrogative determiner            e.g. "which"
 </PRE>
@@ -140,19 +131,6 @@ as defined in <A HREF="Noun.html">Noun</A>.
 </PRE>
 <P></P>
 <A NAME="toc8"></A>
-<H2>Adverbs</H2>
-<P>
-Constructed in <A HREF="Adverb.html">Adverb</A>.  
-Many adverbs are constructed in <A HREF="Structural.html">Structural</A>.
-</P>
-<PRE>
-        Adv ;   -- verb-phrase-modifying adverb,       e.g. "in the house"
-        AdV ;   -- adverb directly attached to verb    e.g. "always"
-        AdA ;   -- adjective-modifying adverb,         e.g. "very"
-        AdN ;   -- numeral-modifying adverb,           e.g. "more than"
-</PRE>
-<P></P>
-<A NAME="toc9"></A>
 <H2>Numerals</H2>
 <P>
 Constructed in <A HREF="Numeral.html">Numeral</A>.
@@ -161,7 +139,7 @@ Constructed in <A HREF="Numeral.html">Numeral</A>.
        Numeral;-- cardinal or ordinal,                e.g. "five/fifth"
 </PRE>
 <P></P>
-<A NAME="toc10"></A>
+<A NAME="toc9"></A>
 <H2>Structural words</H2>
 <P>
 Constructed in <A HREF="Structural.html">Structural</A>.
@@ -169,13 +147,11 @@ Constructed in <A HREF="Structural.html">Structural</A>.
 <PRE>
        Conj ;  -- conjunction,                        e.g. "and"
        DConj ; -- distributed conj.                   e.g. "both - and"
-        PConj ; -- phrase-beginning conj.              e.g. "therefore"
-        CAdv ;  -- comparative adverb                  e.g. "more"
        Subj ;  -- subjunction,                        e.g. "if"
        Prep ;  -- preposition, or just case           e.g. "in"
 </PRE>
 <P></P>
-<A NAME="toc11"></A>
+<A NAME="toc10"></A>
 <H2>Words of open classes</H2>
 <P>
 These are constructed in <A HREF="Lexicon.html">Lexicon</A> and in additional lexicon modules.
--- a/lib/resource-1.0/doc/gfdoc/Common.html
+++ b/lib/resource-1.0/doc/gfdoc/Common.html
@@ -6,12 +6,22 @@
 </HEAD><BODY BGCOLOR="white" TEXT="black">
 <P ALIGN="center"><CENTER><H1> Infrastructure with common implementations.</H1>
 <FONT SIZE="4">
-<I>Last update: 2006-02-25 15:24:23 CET</I><BR>
+<I>Author: </I><BR>
+Last update: Wed May 24 18:29:11 2006
 </FONT></CENTER>

 <P></P>
 <HR NOSHADE SIZE=1>
 <P></P>
+  <UL>
+  <LI><A HREF="#toc1">Infrastructure with common implementations.</A>
+    <UL>
+    <LI><A HREF="#toc2">Top-level units</A>
+    <LI><A HREF="#toc3">Adverbs</A>
+    <LI><A HREF="#toc4">Tense, polarity, and anteriority</A>
+    </UL>
+  </UL>
+
 <P></P>
 <HR NOSHADE SIZE=1>
 <P></P>
@@ -20,8 +30,13 @@ Produced by
 gfdoc - a rudimentary GF document generator.
 (c) Aarne Ranta (<A HREF="mailto:aarne@cs.chalmers.se">aarne@cs.chalmers.se</A>) 2002 under GNU GPL.
 </P>
+<A NAME="toc1"></A>
+<H1>Infrastructure with common implementations.</H1>
 <P>
-This module defines the abstract parameters of tense, polarity, and
+This module defines the categories that uniformly have the linearization
+<CODE>{s : Str}</CODE> in all languages. They are given lock fields that guarantee
+grammatical correctness via type checking.
+Moreover, this module defines the abstract parameters of tense, polarity, and
 anteriority, which are used in <A HREF="Phrase.html">Phrase</A> to generate different
 forms of sentences. Together they give 2 x 4 x 4 = 16 sentence forms.
 These tenses are defined for all languages in the library. More tenses
@@ -32,12 +47,49 @@ Romance languages.
    abstract Common = {
    
      cat
-        Text ;   -- text consisting of several phrases
-        Phr ;    -- phrase in a text                    e.g. "But come here my darling."
-    
-        Pol ;
-        Tense ;
-        Ant ;
+</PRE>
+<P></P>
+<A NAME="toc2"></A>
+<H2>Top-level units</H2>
+<P>
+Constructed in <A HREF="Text.html">Text</A>: <CODE>Text</CODE>.
+</P>
+<PRE>
+        Text ;  -- text consisting of several phrases  e.g. "He is here. Why?"
+        Phr ;   -- phrase in a text                    e.g. "But get out please."
+</PRE>
+<P></P>
+<P>
+Constructed in <A HREF="Phrase.html">Phrase</A>: <CODE>Phr</CODE> and
+</P>
+<PRE>
+        Utt ;   -- sentence, question, word...         e.g. "be quiet"
+        Voc ;   -- vocative or "please"                e.g. "my darling"
+        PConj ; -- phrase-beginning conj.              e.g. "therefore"
+        SC ;    -- embedded sentence or question       e.g. "that it rains"
+</PRE>
+<P></P>
+<A NAME="toc3"></A>
+<H2>Adverbs</H2>
+<P>
+Constructed in <A HREF="Adverb.html">Adverb</A>.  
+Many adverbs are constructed in <A HREF="Structural.html">Structural</A>.
+</P>
+<PRE>
+        Adv ;   -- verb-phrase-modifying adverb,       e.g. "in the house"
+        AdV ;   -- adverb directly attached to verb    e.g. "always"
+        AdA ;   -- adjective-modifying adverb,         e.g. "very"
+        AdN ;   -- numeral-modifying adverb,           e.g. "more than"
+        IAdv ;  -- interrogative adverb                e.g. "why"
+        CAdv ;  -- comparative adverb                  e.g. "more"
+</PRE>
+<P></P>
+<A NAME="toc4"></A>
+<H2>Tense, polarity, and anteriority</H2>
+<PRE>
+        Tense ; -- tense: present, past, future, conditional
+        Pol ;   -- polarity: positive, negative
+        Ant ;   -- anteriority: simultaneous, anterior
    
      fun
        PPos, PNeg : Pol ;             -- I sleep/don't sleep
--- a/lib/resource-1.0/doc/gfdoc/Conjunction.html
+++ b/lib/resource-1.0/doc/gfdoc/Conjunction.html
@@ -6,17 +6,21 @@
 </HEAD><BODY BGCOLOR="white" TEXT="black">
 <P ALIGN="center"><CENTER><H1> Coordination</H1>
 <FONT SIZE="4">
-<I>Last update: 2006-01-20 22:04:10 CET</I><BR>
+<I>Author: </I><BR>
+Last update: Wed May 24 18:29:11 2006
 </FONT></CENTER>

 <P></P>
 <HR NOSHADE SIZE=1>
 <P></P>
+  <UL>
+  <LI><A HREF="#toc1">Coordination</A>
    <UL>
-    <LI><A HREF="#toc1">Rules</A>
-    <LI><A HREF="#toc2">Categories</A>
-    <LI><A HREF="#toc3">List constructors</A>
+    <LI><A HREF="#toc2">Rules</A>
+    <LI><A HREF="#toc3">Categories</A>
+    <LI><A HREF="#toc4">List constructors</A>
    </UL>
+  </UL>

 <P></P>
 <HR NOSHADE SIZE=1>
@@ -26,6 +30,8 @@ Produced by
 gfdoc - a rudimentary GF document generator.
 (c) Aarne Ranta (<A HREF="mailto:aarne@cs.chalmers.se">aarne@cs.chalmers.se</A>) 2002 under GNU GPL.
 </P>
+<A NAME="toc1"></A>
+<H1>Coordination</H1>
 <P>
 Coordination is defined for many different categories; here is
 a sample. The rules apply to <B>lists</B> of two or more elements,
@@ -45,7 +51,7 @@ compatibility with API 0.9 is needed, use
    abstract Conjunction = Cat ** {
 </PRE>
 <P></P>
-<A NAME="toc1"></A>
+<A NAME="toc2"></A>
 <H2>Rules</H2>
 <PRE>
      fun
@@ -60,7 +66,7 @@ compatibility with API 0.9 is needed, use
        DConjAdv : DConj -&gt; [Adv] -&gt; Adv; -- "both badly and slowly"
 </PRE>
 <P></P>
-<A NAME="toc2"></A>
+<A NAME="toc3"></A>
 <H2>Categories</H2>
 <P>
 These categories are only used in this module.
@@ -73,7 +79,7 @@ These categories are only used in this module.
        [AP]{2} ;
 </PRE>
 <P></P>
-<A NAME="toc3"></A>
+<A NAME="toc4"></A>
 <H2>List constructors</H2>
 <P>
 The list constructors are derived from the list notation and therefore
--- a/lib/resource-1.0/doc/gfdoc/Idiom.html
+++ b/lib/resource-1.0/doc/gfdoc/Idiom.html
@@ -6,12 +6,17 @@
 </HEAD><BODY BGCOLOR="white" TEXT="black">
 <P ALIGN="center"><CENTER><H1> Idiomatic expressions</H1>
 <FONT SIZE="4">
-<I>Last update: 2006-05-16 18:46:50 CEST</I><BR>
+<I>Author: </I><BR>
+Last update: Wed May 24 18:29:11 2006
 </FONT></CENTER>

 <P></P>
 <HR NOSHADE SIZE=1>
 <P></P>
+  <UL>
+  <LI><A HREF="#toc1">Idiomatic expressions</A>
+  </UL>
+
 <P></P>
 <HR NOSHADE SIZE=1>
 <P></P>
@@ -20,6 +25,8 @@ Produced by
 gfdoc - a rudimentary GF document generator.
 (c) Aarne Ranta (<A HREF="mailto:aarne@cs.chalmers.se">aarne@cs.chalmers.se</A>) 2002 under GNU GPL.
 </P>
+<A NAME="toc1"></A>
+<H1>Idiomatic expressions</H1>
 <PRE>
    abstract Idiom = Cat ** {
 </PRE>
--- a/lib/resource-1.0/doc/gfdoc/Lang.html
+++ b/lib/resource-1.0/doc/gfdoc/Lang.html
@@ -6,12 +6,17 @@
 </HEAD><BODY BGCOLOR="white" TEXT="black">
 <P ALIGN="center"><CENTER><H1> The Main Module of the Resource Grammar</H1>
 <FONT SIZE="4">
-<I>Last update: 2006-02-20 20:02:47 CET</I><BR>
+<I>Author: </I><BR>
+Last update: Wed May 24 18:29:11 2006
 </FONT></CENTER>

 <P></P>
 <HR NOSHADE SIZE=1>
 <P></P>
+  <UL>
+  <LI><A HREF="#toc1">The Main Module of the Resource Grammar</A>
+  </UL>
+
 <P></P>
 <HR NOSHADE SIZE=1>
 <P></P>
@@ -20,6 +25,8 @@ Produced by
 gfdoc - a rudimentary GF document generator.
 (c) Aarne Ranta (<A HREF="mailto:aarne@cs.chalmers.se">aarne@cs.chalmers.se</A>) 2002 under GNU GPL.
 </P>
+<A NAME="toc1"></A>
+<H1>The Main Module of the Resource Grammar</H1>
 <P>
 This grammar is just a collection of the different modules,
 and the one that can be imported when one wants to test the
--- a/lib/resource-1.0/doc/gfdoc/Mathematical.html
+++ b/lib/resource-1.0/doc/gfdoc/Mathematical.html
@@ -6,12 +6,17 @@
 </HEAD><BODY BGCOLOR="white" TEXT="black">
 <P ALIGN="center"><CENTER><H1> The Mathematics API to the Resource Grammar</H1>
 <FONT SIZE="4">
-<I>Last update: 2006-02-25 21:36:45 CET</I><BR>
+<I>Author: </I><BR>
+Last update: Wed May 24 18:29:15 2006
 </FONT></CENTER>

 <P></P>
 <HR NOSHADE SIZE=1>
 <P></P>
+  <UL>
+  <LI><A HREF="#toc1">The Mathematics API to the Resource Grammar</A>
+  </UL>
+
 <P></P>
 <HR NOSHADE SIZE=1>
 <P></P>
@@ -20,6 +25,8 @@ Produced by
 gfdoc - a rudimentary GF document generator.
 (c) Aarne Ranta (<A HREF="mailto:aarne@cs.chalmers.se">aarne@cs.chalmers.se</A>) 2002 under GNU GPL.
 </P>
+<A NAME="toc1"></A>
+<H1>The Mathematics API to the Resource Grammar</H1>
 <P>
 This grammar is a collection of the different modules.
 It differs from <CODE>Lang</CODE> in two main ways:
--- a/lib/resource-1.0/doc/gfdoc/Multi.html
+++ b/lib/resource-1.0/doc/gfdoc/Multi.html
@@ -0,0 +1,87 @@
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
+<HTML>
+<HEAD>
+<META NAME="generator" CONTENT="http://txt2tags.sf.net">
+<TITLE> Multimodal additions to the resource grammar library</TITLE>
+</HEAD><BODY BGCOLOR="white" TEXT="black">
+<P ALIGN="center"><CENTER><H1> Multimodal additions to the resource grammar library</H1>
+<FONT SIZE="4">
+<I>Author: </I><BR>
+Last update: Wed May 24 18:29:16 2006
+</FONT></CENTER>
+
+<P></P>
+<HR NOSHADE SIZE=1>
+<P></P>
+  <UL>
+  <LI><A HREF="#toc1">Multimodal additions to the resource grammar library</A>
+  </UL>
+
+<P></P>
+<HR NOSHADE SIZE=1>
+<P></P>
+<P>
+Produced by 
+gfdoc - a rudimentary GF document generator.
+(c) Aarne Ranta (<A HREF="mailto:aarne@cs.chalmers.se">aarne@cs.chalmers.se</A>) 2002 under GNU GPL.
+</P>
+<A NAME="toc1"></A>
+<H1>Multimodal additions to the resource grammar library</H1>
+<PRE>
+    abstract Multi = Lang ** {
+    
+      cat
+</PRE>
+<P></P>
+<P>
+Entrypoint for speech recognition - suppresses clicks.
+</P>
+<PRE>
+        Speech ;
+</PRE>
+<P></P>
+<P>
+The entrypoint to sequencialized multimodal input is <CODE>Phr</CODE>.
+The pointing gesture (click) type.
+</P>
+<PRE>
+        Point ;
+    
+      fun
+</PRE>
+<P></P>
+<P>
+The top function to send an utterance to speech recognizer.
+</P>
+<PRE>
+        SpeechUtt : PConj -&gt; Utt -&gt; Voc -&gt; Speech ;
+</PRE>
+<P></P>
+<P>
+Demonstratives.
+</P>
+<PRE>
+        this8point_NP : Point -&gt; NP ;
+        that8point_NP : Point -&gt; NP ;
+        these8point_NP : Point -&gt; NP ;
+        those8point_NP : Point -&gt; NP ;
+        here8point_Adv : Point -&gt; Adv ;
+        here7to8point_Adv : Point -&gt; Adv ;
+        here7from8point_Adv : Point -&gt; Adv ;
+        this8point_Quant : Point -&gt; Quant ;
+        that8point_Quant : Point -&gt; Quant ;
+</PRE>
+<P></P>
+<P>
+Building points from strings.
+</P>
+<PRE>
+        MkPoint : String -&gt; Point ;
+    
+    }
+</PRE>
+<P></P>
+
+<!-- html code generated by txt2tags 2.3 (http://txt2tags.sf.net) -->
+<!-- cmdline: txt2tags -thtml -\-toc multimodal/Multi.txt -->
+</BODY></HTML>
--- a/lib/resource-1.0/doc/gfdoc/Noun.html
+++ b/lib/resource-1.0/doc/gfdoc/Noun.html
@@ -6,18 +6,22 @@
 </HEAD><BODY BGCOLOR="white" TEXT="black">
 <P ALIGN="center"><CENTER><H1> The construction of nouns, noun phrases, and determiners</H1>
 <FONT SIZE="4">
-<I>Last update: 2006-05-16 23:42:30 CEST</I><BR>
+<I>Author: </I><BR>
+Last update: Wed May 24 18:29:12 2006
 </FONT></CENTER>

 <P></P>
 <HR NOSHADE SIZE=1>
 <P></P>
+  <UL>
+  <LI><A HREF="#toc1">The construction of nouns, noun phrases, and determiners</A>
    <UL>
-    <LI><A HREF="#toc1">Noun phrases</A>
-    <LI><A HREF="#toc2">Determiners</A>
-    <LI><A HREF="#toc3">Common nouns</A>
-    <LI><A HREF="#toc4">Apposition</A>
+    <LI><A HREF="#toc2">Noun phrases</A>
+    <LI><A HREF="#toc3">Determiners</A>
+    <LI><A HREF="#toc4">Common nouns</A>
+    <LI><A HREF="#toc5">Apposition</A>
    </UL>
+  </UL>

 <P></P>
 <HR NOSHADE SIZE=1>
@@ -27,11 +31,13 @@ Produced by
 gfdoc - a rudimentary GF document generator.
 (c) Aarne Ranta (<A HREF="mailto:aarne@cs.chalmers.se">aarne@cs.chalmers.se</A>) 2002 under GNU GPL.
 </P>
+<A NAME="toc1"></A>
+<H1>The construction of nouns, noun phrases, and determiners</H1>
 <PRE>
    abstract Noun = Cat ** {
 </PRE>
 <P></P>
-<A NAME="toc1"></A>
+<A NAME="toc2"></A>
 <H2>Noun phrases</H2>
 <P>
 The three main types of noun phrases are
@@ -66,7 +72,7 @@ verb or by an adverb.
        AdvNP   : NP -&gt; Adv -&gt; NP ;    -- Paris at midnight
 </PRE>
 <P></P>
-<A NAME="toc2"></A>
+<A NAME="toc3"></A>
 <H2>Determiners</H2>
 <P>
 The determiner has a fine-grained structure, in which a 'nucleus'
@@ -160,7 +166,7 @@ in semantically odd expressions.
 <P>
 Other determiners are defined in <A HREF="Structural.html">Structural</A>.
 </P>
-<A NAME="toc3"></A>
+<A NAME="toc4"></A>
 <H2>Common nouns</H2>
 <P>
 Simple nouns can be used as nouns outright.
@@ -206,7 +212,7 @@ to decide. Sentential complements are defined in <A HREF="Verb.html">Verb</A>.
        SentCN  : CN -&gt; SC  -&gt; CN ;   -- fact that John smokes, question if he does
 </PRE>
 <P></P>
-<A NAME="toc4"></A>
+<A NAME="toc5"></A>
 <H2>Apposition</H2>
 <P>
 This is certainly overgenerating.
--- a/lib/resource-1.0/doc/gfdoc/Numeral.html
+++ b/lib/resource-1.0/doc/gfdoc/Numeral.html
@@ -6,12 +6,17 @@
 </HEAD><BODY BGCOLOR="white" TEXT="black">
 <P ALIGN="center"><CENTER><H1> Numerals</H1>
 <FONT SIZE="4">
-<I>Last update: 2006-01-17 17:56:17 CET</I><BR>
+<I>Author: </I><BR>
+Last update: Wed May 24 18:29:12 2006
 </FONT></CENTER>

 <P></P>
 <HR NOSHADE SIZE=1>
 <P></P>
+  <UL>
+  <LI><A HREF="#toc1">Numerals</A>
+  </UL>
+
 <P></P>
 <HR NOSHADE SIZE=1>
 <P></P>
@@ -20,6 +25,8 @@ Produced by
 gfdoc - a rudimentary GF document generator.
 (c) Aarne Ranta (<A HREF="mailto:aarne@cs.chalmers.se">aarne@cs.chalmers.se</A>) 2002 under GNU GPL.
 </P>
+<A NAME="toc1"></A>
+<H1>Numerals</H1>
 <P>
 This grammar defines numerals from 1 to 999999. 
 The implementations are adapted from the
--- a/lib/resource-1.0/doc/gfdoc/ParadigmsEng.html
+++ b/lib/resource-1.0/doc/gfdoc/ParadigmsEng.html
@@ -2,51 +2,63 @@
 <HTML>
 <HEAD>
 <META NAME="generator" CONTENT="http://txt2tags.sf.net">
-<TITLE> English Lexical Paradigms</TITLE>
 </HEAD><BODY BGCOLOR="white" TEXT="black">
-<P ALIGN="center"><CENTER><H1> English Lexical Paradigms</H1>
 <FONT SIZE="4">
-<I>Last update: 2006-04-21 16:38:25 CEST</I><BR>
 </FONT></CENTER>

 <P></P>
 <HR NOSHADE SIZE=1>
 <P></P>
+  <UL>
+  <LI><A HREF="#toc1">English Lexical Paradigms</A>
    <UL>
-    <LI><A HREF="#toc1">Parameters</A>
-    <LI><A HREF="#toc2">Nouns</A>
+    <LI><A HREF="#toc2">Parameters</A>
+    <LI><A HREF="#toc3">Nouns</A>
      <UL>
-      <LI><A HREF="#toc3">Compound nouns</A>
-      <LI><A HREF="#toc4">Relational nouns</A>
-      <LI><A HREF="#toc5">Relational common noun phrases</A>
-      <LI><A HREF="#toc6">Proper names and noun phrases</A>
+      <LI><A HREF="#toc4">Compound nouns</A>
+      <LI><A HREF="#toc5">Relational nouns</A>
+      <LI><A HREF="#toc6">Relational common noun phrases</A>
+      <LI><A HREF="#toc7">Proper names and noun phrases</A>
      </UL>
-    <LI><A HREF="#toc7">Adjectives</A>
+    <LI><A HREF="#toc8">Adjectives</A>
      <UL>
-      <LI><A HREF="#toc8">Two-place adjectives</A>
+      <LI><A HREF="#toc9">Two-place adjectives</A>
      </UL>
-    <LI><A HREF="#toc9">Adverbs</A>
-    <LI><A HREF="#toc10">Prepositions</A>
-    <LI><A HREF="#toc11">Verbs</A>
+    <LI><A HREF="#toc10">Adverbs</A>
+    <LI><A HREF="#toc11">Prepositions</A>
+    <LI><A HREF="#toc12">Verbs</A>
      <UL>
-      <LI><A HREF="#toc12">Verbs with a particle.</A>
-      <LI><A HREF="#toc13">Reflexive verbs</A>
-      <LI><A HREF="#toc14">Two-place verbs</A>
-      <LI><A HREF="#toc15">Three-place verbs</A>
-      <LI><A HREF="#toc16">Other complement patterns</A>
+      <LI><A HREF="#toc13">Verbs with a particle.</A>
+      <LI><A HREF="#toc14">Reflexive verbs</A>
+      <LI><A HREF="#toc15">Two-place verbs</A>
+      <LI><A HREF="#toc16">Three-place verbs</A>
+      <LI><A HREF="#toc17">Other complement patterns</A>
      </UL>
-    <LI><A HREF="#toc17">Definitions of paradigms</A>
+    <LI><A HREF="#toc18">Definitions of paradigms</A>
    </UL>
+  </UL>

 <P></P>
 <HR NOSHADE SIZE=1>
 <P></P>
 <P>
+Author: 
+Last update: Wed May 24 18:29:14 2006
+</P>
+<P>
 Produced by 
 gfdoc - a rudimentary GF document generator.
 (c) Aarne Ranta (<A HREF="mailto:aarne@cs.chalmers.se">aarne@cs.chalmers.se</A>) 2002 under GNU GPL.
 </P>
 <P>
+==
+</P>
+<P>
+# -path=.:../abstract:../../prelude:../common
+</P>
+<A NAME="toc1"></A>
+<H1>English Lexical Paradigms</H1>
+<P>
 Aarne Ranta 2003--2005
 </P>
 <P>
@@ -85,7 +97,7 @@ The following modules are presupposed:
      in {
 </PRE>
 <P></P>
-<A NAME="toc1"></A>
+<A NAME="toc2"></A>
 <H2>Parameters</H2>
 <P>
 To abstract over gender names, we define the following identifiers.
@@ -126,7 +138,7 @@ Prepositions are used in many-argument functions for rection.
      Preposition : Type ;
 </PRE>
 <P></P>
-<A NAME="toc2"></A>
+<A NAME="toc3"></A>
 <H2>Nouns</H2>
 <P>
 Worst case: give all four forms and the semantic gender.
@@ -160,7 +172,7 @@ function:
      genderN : Gender -&gt; N -&gt; N ;
 </PRE>
 <P></P>
-<A NAME="toc3"></A>
+<A NAME="toc4"></A>
 <H3>Compound nouns</H3>
 <P>
 A compound noun ia an uninflected string attached to an inflected noun,
@@ -170,7 +182,7 @@ such as <I>baby boom</I>, <I>chief executive officer</I>.
      compoundN : Str -&gt; N -&gt; N ;
 </PRE>
 <P></P>
-<A NAME="toc4"></A>
+<A NAME="toc5"></A>
 <H3>Relational nouns</H3>
 <P>
 Relational nouns (<I>daughter of x</I>) need a preposition. 
@@ -198,7 +210,7 @@ Three-place relational nouns (<I>the connection from x to y</I>) need two prepos
      mkN3 : N -&gt; Preposition -&gt; Preposition -&gt; N3 ;
 </PRE>
 <P></P>
-<A NAME="toc5"></A>
+<A NAME="toc6"></A>
 <H3>Relational common noun phrases</H3>
 <P>
 In some cases, you may want to make a complex <CODE>CN</CODE> into a
@@ -209,7 +221,7 @@ relational noun (e.g. <I>the old town hall of</I>).
      cnN3 : CN -&gt; Preposition -&gt; Preposition -&gt; N3 ;
 </PRE>
 <P></P>
-<A NAME="toc6"></A>
+<A NAME="toc7"></A>
 <H3>Proper names and noun phrases</H3>
 <P>
 Proper names, with a regular genitive, are formed as follows
@@ -233,7 +245,7 @@ genitive, you can use the worst-case function.
      mkNP : Str -&gt; Str -&gt; Number -&gt; Gender -&gt; NP ; 
 </PRE>
 <P></P>
-<A NAME="toc7"></A>
+<A NAME="toc8"></A>
 <H2>Adjectives</H2>
 <P>
 Non-comparison one-place adjectives need two forms: one for
@@ -251,7 +263,7 @@ even for cases with the variation <I>happy - happily</I>.
      regA : Str -&gt; A ;
 </PRE>
 <P></P>
-<A NAME="toc8"></A>
+<A NAME="toc9"></A>
 <H3>Two-place adjectives</H3>
 <P>
 Two-place adjectives need a preposition for their second argument.
@@ -301,7 +313,7 @@ From a given <CODE>ADeg</CODE>, it is possible to get back to <CODE>A</CODE>.
      adegA : ADeg -&gt; A ;
 </PRE>
 <P></P>
-<A NAME="toc9"></A>
+<A NAME="toc10"></A>
 <H2>Adverbs</H2>
 <P>
 Adverbs are not inflected. Most lexical ones have position
@@ -319,7 +331,7 @@ Adverbs modifying adjectives and sentences can also be formed.
      mkAdA : Str -&gt; AdA ;
 </PRE>
 <P></P>
-<A NAME="toc10"></A>
+<A NAME="toc11"></A>
 <H2>Prepositions</H2>
 <P>
 A preposition as used for rection in the lexicon, as well as to
@@ -333,7 +345,7 @@ build <CODE>PP</CODE>s in the resource API, just requires a string.
 <P>
 (These two functions are synonyms.)
 </P>
-<A NAME="toc11"></A>
+<A NAME="toc12"></A>
 <H2>Verbs</H2>
 <P>
 Except for <I>be</I>, the worst case needs five forms: the infinitive and
@@ -372,7 +384,7 @@ duplication in the present participle.
      irregDuplV : (get,   got,   gotten : Str) -&gt; V ;
 </PRE>
 <P></P>
-<A NAME="toc12"></A>
+<A NAME="toc13"></A>
 <H3>Verbs with a particle.</H3>
 <P>
 The particle, such as in <I>switch on</I>, is given as a string.
@@ -381,7 +393,7 @@ The particle, such as in <I>switch on</I>, is given as a string.
      partV  : V -&gt; Str -&gt; V ;
 </PRE>
 <P></P>
-<A NAME="toc13"></A>
+<A NAME="toc14"></A>
 <H3>Reflexive verbs</H3>
 <P>
 By default, verbs are not reflexive; this function makes them that.
@@ -390,7 +402,7 @@ By default, verbs are not reflexive; this function makes them that.
      reflV  : V -&gt; V ;
 </PRE>
 <P></P>
-<A NAME="toc14"></A>
+<A NAME="toc15"></A>
 <H3>Two-place verbs</H3>
 <P>
 Two-place verbs need a preposition, except the special case with direct object.
@@ -402,7 +414,7 @@ Two-place verbs need a preposition, except the special case with direct object.
      dirV2 : V -&gt; V2 ;
 </PRE>
 <P></P>
-<A NAME="toc15"></A>
+<A NAME="toc16"></A>
 <H3>Three-place verbs</H3>
 <P>
 Three-place (ditransitive) verbs need two prepositions, of which
@@ -414,7 +426,7 @@ the first one or both can be absent.
      dirdirV3 : V -&gt; V3 ;                               -- give,_,_
 </PRE>
 <P></P>
-<A NAME="toc16"></A>
+<A NAME="toc17"></A>
 <H3>Other complement patterns</H3>
 <P>
 Verbs and adjectives can take complements such as sentences,
@@ -448,7 +460,7 @@ as an adverb. Likewise <CODE>AS, A2S, AV, A2V</CODE> are just <CODE>A</CODE>.
      AS, A2S, AV, A2V : Type ;
 </PRE>
 <P></P>
-<A NAME="toc17"></A>
+<A NAME="toc18"></A>
 <H2>Definitions of paradigms</H2>
 <P>
 The definitions should not bother the user of the API. So they are
--- a/lib/resource-1.0/doc/gfdoc/ParadigmsFin.html
+++ b/lib/resource-1.0/doc/gfdoc/ParadigmsFin.html
@@ -2,36 +2,48 @@
 <HTML>
 <HEAD>
 <META NAME="generator" CONTENT="http://txt2tags.sf.net">
-<TITLE> Finnish Lexical Paradigms</TITLE>
 </HEAD><BODY BGCOLOR="white" TEXT="black">
-<P ALIGN="center"><CENTER><H1> Finnish Lexical Paradigms</H1>
 <FONT SIZE="4">
-<I>Last update: 2006-03-07 21:08:18 CET</I><BR>
 </FONT></CENTER>

 <P></P>
 <HR NOSHADE SIZE=1>
 <P></P>
+  <UL>
+  <LI><A HREF="#toc1">Finnish Lexical Paradigms</A>
    <UL>
-    <LI><A HREF="#toc1">Parameters</A>
-    <LI><A HREF="#toc2">Nouns</A>
-    <LI><A HREF="#toc3">Adjectives</A>
-    <LI><A HREF="#toc4">Verbs</A>
+    <LI><A HREF="#toc2">Parameters</A>
+    <LI><A HREF="#toc3">Nouns</A>
+    <LI><A HREF="#toc4">Adjectives</A>
+    <LI><A HREF="#toc5">Verbs</A>
      <UL>
-      <LI><A HREF="#toc5">Three-place verbs</A>
-      <LI><A HREF="#toc6">Other complement patterns</A>
+      <LI><A HREF="#toc6">Three-place verbs</A>
+      <LI><A HREF="#toc7">Other complement patterns</A>
      </UL>
    </UL>
+  </UL>

 <P></P>
 <HR NOSHADE SIZE=1>
 <P></P>
 <P>
+Author: 
+Last update: Wed May 24 18:29:14 2006
+</P>
+<P>
 Produced by 
 gfdoc - a rudimentary GF document generator.
 (c) Aarne Ranta (<A HREF="mailto:aarne@cs.chalmers.se">aarne@cs.chalmers.se</A>) 2002 under GNU GPL.
 </P>
 <P>
+==
+</P>
+<P>
+# -path=.:../abstract:../common:../../prelude
+</P>
+<A NAME="toc1"></A>
+<H1>Finnish Lexical Paradigms</H1>
+<P>
 Aarne Ranta 2003--2005
 </P>
 <P>
@@ -77,7 +89,7 @@ flags optimize=all ;
      flags optimize=noexpand ;
 </PRE>
 <P></P>
-<A NAME="toc1"></A>
+<A NAME="toc2"></A>
 <H2>Parameters</H2>
 <P>
 To abstract over gender, number, and (some) case names, 
@@ -117,7 +129,7 @@ just a case, or a pre/postposition and a case.
      casePrep    : Case -&gt;        Prep ;  -- adessive
 </PRE>
 <P></P>
-<A NAME="toc2"></A>
+<A NAME="toc3"></A>
 <H2>Nouns</H2>
 <P>
 The worst case gives ten forms and the semantic gender.
@@ -317,7 +329,7 @@ The plural forms are filtered away by the compiler.
      mkNP  : N -&gt; Number -&gt; NP ; 
 </PRE>
 <P></P>
-<A NAME="toc3"></A>
+<A NAME="toc4"></A>
 <H2>Adjectives</H2>
 <P>
 Non-comparison one-place adjectives are just like nouns.
@@ -349,7 +361,7 @@ The regular adjectives are based on <CODE>regN</CODE> in the positive.
      regA : (punainen : Str) -&gt; A ;
 </PRE>
 <P></P>
-<A NAME="toc4"></A>
+<A NAME="toc5"></A>
 <H2>Verbs</H2>
 <P>
 The grammar does not cover the potential mood and some nominal
@@ -455,7 +467,7 @@ But this is taken care of by <CODE>ClauseFin</CODE>.
      dirV2 : V -&gt; V2 ;
 </PRE>
 <P></P>
-<A NAME="toc5"></A>
+<A NAME="toc6"></A>
 <H3>Three-place verbs</H3>
 <P>
 Three-place (ditransitive) verbs need two prepositions, of which
@@ -467,7 +479,7 @@ the first one or both can be absent.
      dirdirV3 : V         -&gt; V3 ;            -- acc, allat
 </PRE>
 <P></P>
-<A NAME="toc6"></A>
+<A NAME="toc7"></A>
 <H3>Other complement patterns</H3>
 <P>
 Verbs and adjectives can take complements such as sentences,
--- a/lib/resource-1.0/doc/gfdoc/ParadigmsFre.html
+++ b/lib/resource-1.0/doc/gfdoc/ParadigmsFre.html
@@ -2,49 +2,61 @@
 <HTML>
 <HEAD>
 <META NAME="generator" CONTENT="http://txt2tags.sf.net">
-<TITLE> French Lexical Paradigms</TITLE>
 </HEAD><BODY BGCOLOR="white" TEXT="black">
-<P ALIGN="center"><CENTER><H1> French Lexical Paradigms</H1>
 <FONT SIZE="4">
-<I>Last update: 2006-03-07 21:08:17 CET</I><BR>
 </FONT></CENTER>

 <P></P>
 <HR NOSHADE SIZE=1>
 <P></P>
+  <UL>
+  <LI><A HREF="#toc1">French Lexical Paradigms</A>
    <UL>
-    <LI><A HREF="#toc1">Parameters</A>
-    <LI><A HREF="#toc2">Nouns</A>
+    <LI><A HREF="#toc2">Parameters</A>
+    <LI><A HREF="#toc3">Nouns</A>
      <UL>
-      <LI><A HREF="#toc3">Compound nouns</A>
-      <LI><A HREF="#toc4">Relational nouns</A>
-      <LI><A HREF="#toc5">Relational common noun phrases</A>
-      <LI><A HREF="#toc6">Proper names and noun phrases</A>
+      <LI><A HREF="#toc4">Compound nouns</A>
+      <LI><A HREF="#toc5">Relational nouns</A>
+      <LI><A HREF="#toc6">Relational common noun phrases</A>
+      <LI><A HREF="#toc7">Proper names and noun phrases</A>
      </UL>
-    <LI><A HREF="#toc7">Adjectives</A>
+    <LI><A HREF="#toc8">Adjectives</A>
      <UL>
-      <LI><A HREF="#toc8">Two-place adjectives</A>
-      <LI><A HREF="#toc9">Comparison adjectives</A>
+      <LI><A HREF="#toc9">Two-place adjectives</A>
+      <LI><A HREF="#toc10">Comparison adjectives</A>
      </UL>
-    <LI><A HREF="#toc10">Adverbs</A>
-    <LI><A HREF="#toc11">Verbs</A>
+    <LI><A HREF="#toc11">Adverbs</A>
+    <LI><A HREF="#toc12">Verbs</A>
      <UL>
-      <LI><A HREF="#toc12">Two-place verbs</A>
-      <LI><A HREF="#toc13">Three-place verbs</A>
-      <LI><A HREF="#toc14">Other complement patterns</A>
+      <LI><A HREF="#toc13">Two-place verbs</A>
+      <LI><A HREF="#toc14">Three-place verbs</A>
+      <LI><A HREF="#toc15">Other complement patterns</A>
      </UL>
-    <LI><A HREF="#toc15">Definitions of the paradigms</A>
+    <LI><A HREF="#toc16">Definitions of the paradigms</A>
    </UL>
+  </UL>

 <P></P>
 <HR NOSHADE SIZE=1>
 <P></P>
 <P>
+Author: 
+Last update: Wed May 24 18:29:14 2006
+</P>
+<P>
 Produced by 
 gfdoc - a rudimentary GF document generator.
 (c) Aarne Ranta (<A HREF="mailto:aarne@cs.chalmers.se">aarne@cs.chalmers.se</A>) 2002 under GNU GPL.
 </P>
 <P>
+==
+</P>
+<P>
+# -path=.:../romance:../common:../abstract:../../prelude
+</P>
+<A NAME="toc1"></A>
+<H1>French Lexical Paradigms</H1>
+<P>
 Aarne Ranta 2003
 </P>
 <P>
@@ -84,7 +96,7 @@ words.
      flags optimize=all ;
 </PRE>
 <P></P>
-<A NAME="toc1"></A>
+<A NAME="toc2"></A>
 <H2>Parameters</H2>
 <P>
 To abstract over gender names, we define the following identifiers.
@@ -123,7 +135,7 @@ amalgamate with the following word (the 'genitive' <I>de</I> and the
      mkPreposition : Str -&gt; Preposition ;
 </PRE>
 <P></P>
-<A NAME="toc2"></A>
+<A NAME="toc3"></A>
 <H2>Nouns</H2>
 <P>
 Worst case: give both two forms and the gender. 
@@ -153,7 +165,7 @@ Adding gender information widens the scope of the foregoing function.
      regGenN : Str -&gt; Gender -&gt; N ;
 </PRE>
 <P></P>
-<A NAME="toc3"></A>
+<A NAME="toc4"></A>
 <H3>Compound nouns</H3>
 <P>
 Some nouns are ones where the first part is inflected as a noun but
@@ -165,7 +177,7 @@ they are frequent in lexica.
      compN : N -&gt; Str -&gt; N ;
 </PRE>
 <P></P>
-<A NAME="toc4"></A>
+<A NAME="toc5"></A>
 <H3>Relational nouns</H3>
 <P>
 Relational nouns (<I>fille de x</I>) need a case and a preposition. 
@@ -190,7 +202,7 @@ Three-place relational nouns (<I>la connection de x
      mkN3 : N -&gt; Preposition -&gt; Preposition -&gt; N3 ;
 </PRE>
 <P></P>
-<A NAME="toc5"></A>
+<A NAME="toc6"></A>
 <H3>Relational common noun phrases</H3>
 <P>
 In some cases, you may want to make a complex <CODE>CN</CODE> into a
@@ -198,7 +210,7 @@ relational noun (e.g. <I>the old town hall of</I>). However, <CODE>N2</CODE> and
 <CODE>N3</CODE> are purely lexical categories. But you can use the <CODE>AdvCN</CODE>
 and <CODE>PrepNP</CODE> constructions to build phrases like this.
 </P>
-<A NAME="toc6"></A>
+<A NAME="toc7"></A>
 <H3>Proper names and noun phrases</H3>
 <P>
 Proper names need a string and a gender.
@@ -215,7 +227,7 @@ you can use the worst-case function.
      mkNP : Str -&gt; Gender -&gt; Number -&gt; NP ; 
 </PRE>
 <P></P>
-<A NAME="toc7"></A>
+<A NAME="toc8"></A>
 <H2>Adjectives</H2>
 <P>
 Non-comparison one-place adjectives need four forms in the worst
@@ -246,7 +258,7 @@ provided.
      prefA : A -&gt; A ;
 </PRE>
 <P></P>
-<A NAME="toc8"></A>
+<A NAME="toc9"></A>
 <H3>Two-place adjectives</H3>
 <P>
 Two-place adjectives need a preposition for their second argument.
@@ -255,7 +267,7 @@ Two-place adjectives need a preposition for their second argument.
      mkA2 : A -&gt; Preposition -&gt; A2 ;
 </PRE>
 <P></P>
-<A NAME="toc9"></A>
+<A NAME="toc10"></A>
 <H3>Comparison adjectives</H3>
 <P>
 Comparison adjectives are in the worst case put up from two
@@ -281,7 +293,7 @@ provided.
      prefA : A -&gt; A ;
 </PRE>
 <P></P>
-<A NAME="toc10"></A>
+<A NAME="toc11"></A>
 <H2>Adverbs</H2>
 <P>
 Adverbs are not inflected. Most lexical ones have position
@@ -305,7 +317,7 @@ Adverbs modifying adjectives and sentences can also be formed.
      mkAdA : Str -&gt; AdA ;
 </PRE>
 <P></P>
-<A NAME="toc11"></A>
+<A NAME="toc12"></A>
 <H2>Verbs</H2>
 <P>
 Irregular verbs are given in the module <CODE>VerbsFre</CODE>. 
@@ -342,7 +354,7 @@ To change it to <I>
      reflV : V -&gt; V ;
 </PRE>
 <P></P>
-<A NAME="toc12"></A>
+<A NAME="toc13"></A>
 <H3>Two-place verbs</H3>
 <P>
 Two-place verbs need a preposition, except the special case with direct object.
@@ -361,7 +373,7 @@ You can reuse a <CODE>V2</CODE> verb in <CODE>V</CODE>.
      v2V : V2 -&gt; V ;
 </PRE>
 <P></P>
-<A NAME="toc13"></A>
+<A NAME="toc14"></A>
 <H3>Three-place verbs</H3>
 <P>
 Three-place (ditransitive) verbs need two prepositions, of which
@@ -373,7 +385,7 @@ the first one or both can be absent.
      dirdirV3 : V -&gt; V3 ;                               -- donner,_,_
 </PRE>
 <P></P>
-<A NAME="toc14"></A>
+<A NAME="toc15"></A>
 <H3>Other complement patterns</H3>
 <P>
 Verbs and adjectives can take complements such as sentences,
@@ -409,7 +421,7 @@ as an adverb. Likewise <CODE>AS, A2S, AV, A2V</CODE> are just <CODE>A</CODE>.
      AS, A2S, AV, A2V : Type ;
 </PRE>
 <P></P>
-<A NAME="toc15"></A>
+<A NAME="toc16"></A>
 <H2>Definitions of the paradigms</H2>
 <P>
 The definitions should not bother the user of the API. So they are
--- a/lib/resource-1.0/doc/gfdoc/ParadigmsGer.html
+++ b/lib/resource-1.0/doc/gfdoc/ParadigmsGer.html
@@ -34,13 +34,20 @@
 <HR NOSHADE SIZE=1>
 <P></P>
 <P>
-Last update: 2006-01-20 22:04:10 CET
+Author: 
+Last update: Wed May 24 18:29:14 2006
 </P>
 <P>
 Produced by 
 gfdoc - a rudimentary GF document generator.
 (c) Aarne Ranta (<A HREF="mailto:aarne@cs.chalmers.se">aarne@cs.chalmers.se</A>) 2002 under GNU GPL.
 </P>
+<P>
+==
+</P>
+<P>
+# -path=.:../common:../abstract:../../prelude
+</P>
 <A NAME="toc1"></A>
 <H1>German Lexical Paradigms</H1>
 <P>
--- a/lib/resource-1.0/doc/gfdoc/ParadigmsIta.html
+++ b/lib/resource-1.0/doc/gfdoc/ParadigmsIta.html
@@ -2,49 +2,61 @@
 <HTML>
 <HEAD>
 <META NAME="generator" CONTENT="http://txt2tags.sf.net">
-<TITLE> Italian Lexical Paradigms</TITLE>
 </HEAD><BODY BGCOLOR="white" TEXT="black">
-<P ALIGN="center"><CENTER><H1> Italian Lexical Paradigms</H1>
 <FONT SIZE="4">
-<I>Last update: 2006-02-22 19:06:50 CET</I><BR>
 </FONT></CENTER>

 <P></P>
 <HR NOSHADE SIZE=1>
 <P></P>
+  <UL>
+  <LI><A HREF="#toc1">Italian Lexical Paradigms</A>
    <UL>
-    <LI><A HREF="#toc1">Parameters</A>
-    <LI><A HREF="#toc2">Nouns</A>
+    <LI><A HREF="#toc2">Parameters</A>
+    <LI><A HREF="#toc3">Nouns</A>
      <UL>
-      <LI><A HREF="#toc3">Compound nouns</A>
-      <LI><A HREF="#toc4">Relational nouns</A>
-      <LI><A HREF="#toc5">Relational common noun phrases</A>
-      <LI><A HREF="#toc6">Proper names and noun phrases</A>
+      <LI><A HREF="#toc4">Compound nouns</A>
+      <LI><A HREF="#toc5">Relational nouns</A>
+      <LI><A HREF="#toc6">Relational common noun phrases</A>
+      <LI><A HREF="#toc7">Proper names and noun phrases</A>
      </UL>
-    <LI><A HREF="#toc7">Adjectives</A>
+    <LI><A HREF="#toc8">Adjectives</A>
      <UL>
-      <LI><A HREF="#toc8">Two-place adjectives</A>
-      <LI><A HREF="#toc9">Comparison adjectives</A>
+      <LI><A HREF="#toc9">Two-place adjectives</A>
+      <LI><A HREF="#toc10">Comparison adjectives</A>
      </UL>
-    <LI><A HREF="#toc10">Adverbs</A>
-    <LI><A HREF="#toc11">Verbs</A>
+    <LI><A HREF="#toc11">Adverbs</A>
+    <LI><A HREF="#toc12">Verbs</A>
      <UL>
-      <LI><A HREF="#toc12">Two-place verbs</A>
-      <LI><A HREF="#toc13">Three-place verbs</A>
-      <LI><A HREF="#toc14">Other complement patterns</A>
+      <LI><A HREF="#toc13">Two-place verbs</A>
+      <LI><A HREF="#toc14">Three-place verbs</A>
+      <LI><A HREF="#toc15">Other complement patterns</A>
      </UL>
-    <LI><A HREF="#toc15">The definitions of the paradigms</A>
+    <LI><A HREF="#toc16">The definitions of the paradigms</A>
    </UL>
+  </UL>

 <P></P>
 <HR NOSHADE SIZE=1>
 <P></P>
 <P>
+Author: 
+Last update: Wed May 24 18:29:15 2006
+</P>
+<P>
 Produced by 
 gfdoc - a rudimentary GF document generator.
 (c) Aarne Ranta (<A HREF="mailto:aarne@cs.chalmers.se">aarne@cs.chalmers.se</A>) 2002 under GNU GPL.
 </P>
 <P>
+==
+</P>
+<P>
+# -path=.:../romance:../common:../abstract:../../prelude
+</P>
+<A NAME="toc1"></A>
+<H1>Italian Lexical Paradigms</H1>
+<P>
 Aarne Ranta 2003
 </P>
 <P>
@@ -85,7 +97,7 @@ words.
      flags optimize=all ;
 </PRE>
 <P></P>
-<A NAME="toc1"></A>
+<A NAME="toc2"></A>
 <H2>Parameters</H2>
 <P>
 To abstract over gender names, we define the following identifiers.
@@ -124,7 +136,7 @@ amalgamate with the following word (the 'genitive' <I>de</I> and the
      mkPreposition : Str -&gt; Preposition ;
 </PRE>
 <P></P>
-<A NAME="toc2"></A>
+<A NAME="toc3"></A>
 <H2>Nouns</H2>
 <P>
 Worst case: give both two forms and the gender. 
@@ -151,7 +163,7 @@ To force a different gender, use one of the following functions.
      femN  : N -&gt; N ;
 </PRE>
 <P></P>
-<A NAME="toc3"></A>
+<A NAME="toc4"></A>
 <H3>Compound nouns</H3>
 <P>
 Some nouns are ones where the first part is inflected as a noun but
@@ -163,7 +175,7 @@ they are frequent in lexica.
      compN : N -&gt; Str -&gt; N ;
 </PRE>
 <P></P>
-<A NAME="toc4"></A>
+<A NAME="toc5"></A>
 <H3>Relational nouns</H3>
 <P>
 Relational nouns (<I>figlio di x</I>) need a case and a preposition. 
@@ -188,7 +200,7 @@ Three-place relational nouns (<I>la connessione di x a y</I>) need two prepositi
      mkN3 : N -&gt; Preposition -&gt; Preposition -&gt; N3 ;
 </PRE>
 <P></P>
-<A NAME="toc5"></A>
+<A NAME="toc6"></A>
 <H3>Relational common noun phrases</H3>
 <P>
 In some cases, you may want to make a complex <CODE>CN</CODE> into a
@@ -196,7 +208,7 @@ relational noun (e.g. <I>the old town hall of</I>). However, <CODE>N2</CODE> and
 <CODE>N3</CODE> are purely lexical categories. But you can use the <CODE>AdvCN</CODE>
 and <CODE>PrepNP</CODE> constructions to build phrases like this.
 </P>
-<A NAME="toc6"></A>
+<A NAME="toc7"></A>
 <H3>Proper names and noun phrases</H3>
 <P>
 Proper names need a string and a gender.
@@ -213,7 +225,7 @@ you can use the worst-case function.
      mkNP : Str -&gt; Gender -&gt; Number -&gt; NP ; 
 </PRE>
 <P></P>
-<A NAME="toc7"></A>
+<A NAME="toc8"></A>
 <H2>Adjectives</H2>
 <P>
 Non-comparison one-place adjectives need five forms in the worst
@@ -241,7 +253,7 @@ provided.
      prefA : A -&gt; A ;
 </PRE>
 <P></P>
-<A NAME="toc8"></A>
+<A NAME="toc9"></A>
 <H3>Two-place adjectives</H3>
 <P>
 Two-place adjectives need a preposition for their second argument.
@@ -250,7 +262,7 @@ Two-place adjectives need a preposition for their second argument.
      mkA2 : A -&gt; Preposition -&gt; A2 ;
 </PRE>
 <P></P>
-<A NAME="toc9"></A>
+<A NAME="toc10"></A>
 <H3>Comparison adjectives</H3>
 <P>
 Comparison adjectives are in the worst case put up from two
@@ -276,7 +288,7 @@ with comparison by <I>plus</I>.
      regADeg : Str -&gt; A ;
 </PRE>
 <P></P>
-<A NAME="toc10"></A>
+<A NAME="toc11"></A>
 <H2>Adverbs</H2>
 <P>
 Adverbs are not inflected. Most lexical ones have position
@@ -300,7 +312,7 @@ Adverbs modifying adjectives and sentences can also be formed.
      mkAdA : Str -&gt; AdA ;
 </PRE>
 <P></P>
-<A NAME="toc11"></A>
+<A NAME="toc12"></A>
 <H2>Verbs</H2>
 <P>
 Regular verbs are ones with the infinitive <I>er</I> or <I>ir</I>, the
@@ -331,7 +343,7 @@ Reflexive implies <I>essere</I>.
      reflV : V -&gt; V ;
 </PRE>
 <P></P>
-<A NAME="toc12"></A>
+<A NAME="toc13"></A>
 <H3>Two-place verbs</H3>
 <P>
 Two-place verbs need a preposition, except the special case with direct object.
@@ -350,7 +362,7 @@ You can reuse a <CODE>V2</CODE> verb in <CODE>V</CODE>.
      v2V : V2 -&gt; V ;
 </PRE>
 <P></P>
-<A NAME="toc13"></A>
+<A NAME="toc14"></A>
 <H3>Three-place verbs</H3>
 <P>
 Three-place (ditransitive) verbs need two prepositions, of which
@@ -362,7 +374,7 @@ the first one or both can be absent.
      dirdirV3 : V -&gt; V3 ;                               -- donner,_,_
 </PRE>
 <P></P>
-<A NAME="toc14"></A>
+<A NAME="toc15"></A>
 <H3>Other complement patterns</H3>
 <P>
 Verbs and adjectives can take complements such as sentences,
@@ -398,7 +410,7 @@ as an adverb. Likewise <CODE>AS, A2S, AV, A2V</CODE> are just <CODE>A</CODE>.
      AS, A2S, AV, A2V : Type ;
 </PRE>
 <P></P>
-<A NAME="toc15"></A>
+<A NAME="toc16"></A>
 <H2>The definitions of the paradigms</H2>
 <P>
 The definitions should not bother the user of the API. So they are
--- a/lib/resource-1.0/doc/gfdoc/ParadigmsNor.html
+++ b/lib/resource-1.0/doc/gfdoc/ParadigmsNor.html
@@ -2,51 +2,63 @@
 <HTML>
 <HEAD>
 <META NAME="generator" CONTENT="http://txt2tags.sf.net">
-<TITLE> Norwegian Lexical Paradigms</TITLE>
 </HEAD><BODY BGCOLOR="white" TEXT="black">
-<P ALIGN="center"><CENTER><H1> Norwegian Lexical Paradigms</H1>
 <FONT SIZE="4">
-<I>Last update: 2006-03-07 21:08:17 CET</I><BR>
 </FONT></CENTER>

 <P></P>
 <HR NOSHADE SIZE=1>
 <P></P>
+  <UL>
+  <LI><A HREF="#toc1">Norwegian Lexical Paradigms</A>
    <UL>
-    <LI><A HREF="#toc1">Parameters</A>
-    <LI><A HREF="#toc2">Nouns</A>
+    <LI><A HREF="#toc2">Parameters</A>
+    <LI><A HREF="#toc3">Nouns</A>
      <UL>
-      <LI><A HREF="#toc3">Compound nouns</A>
-      <LI><A HREF="#toc4">Relational nouns</A>
-      <LI><A HREF="#toc5">Relational common noun phrases</A>
-      <LI><A HREF="#toc6">Proper names and noun phrases</A>
+      <LI><A HREF="#toc4">Compound nouns</A>
+      <LI><A HREF="#toc5">Relational nouns</A>
+      <LI><A HREF="#toc6">Relational common noun phrases</A>
+      <LI><A HREF="#toc7">Proper names and noun phrases</A>
      </UL>
-    <LI><A HREF="#toc7">Adjectives</A>
+    <LI><A HREF="#toc8">Adjectives</A>
      <UL>
-      <LI><A HREF="#toc8">Two-place adjectives</A>
+      <LI><A HREF="#toc9">Two-place adjectives</A>
      </UL>
-    <LI><A HREF="#toc9">Adverbs</A>
-    <LI><A HREF="#toc10">Prepositions</A>
-    <LI><A HREF="#toc11">Verbs</A>
+    <LI><A HREF="#toc10">Adverbs</A>
+    <LI><A HREF="#toc11">Prepositions</A>
+    <LI><A HREF="#toc12">Verbs</A>
      <UL>
-      <LI><A HREF="#toc12">Verbs with a particle.</A>
-      <LI><A HREF="#toc13">Deponent verbs.</A>
-      <LI><A HREF="#toc14">Two-place verbs</A>
-      <LI><A HREF="#toc15">Three-place verbs</A>
-      <LI><A HREF="#toc16">Other complement patterns</A>
+      <LI><A HREF="#toc13">Verbs with a particle.</A>
+      <LI><A HREF="#toc14">Deponent verbs.</A>
+      <LI><A HREF="#toc15">Two-place verbs</A>
+      <LI><A HREF="#toc16">Three-place verbs</A>
+      <LI><A HREF="#toc17">Other complement patterns</A>
      </UL>
-    <LI><A HREF="#toc17">Definitions of the paradigms</A>
+    <LI><A HREF="#toc18">Definitions of the paradigms</A>
    </UL>
+  </UL>

 <P></P>
 <HR NOSHADE SIZE=1>
 <P></P>
 <P>
+Author: 
+Last update: Wed May 24 18:29:15 2006
+</P>
+<P>
 Produced by 
 gfdoc - a rudimentary GF document generator.
 (c) Aarne Ranta (<A HREF="mailto:aarne@cs.chalmers.se">aarne@cs.chalmers.se</A>) 2002 under GNU GPL.
 </P>
 <P>
+==
+</P>
+<P>
+# -path=.:../scandinavian:../common:../abstract:../../prelude
+</P>
+<A NAME="toc1"></A>
+<H1>Norwegian Lexical Paradigms</H1>
+<P>
 Aarne Ranta 2003
 </P>
 <P>
@@ -84,7 +96,7 @@ words.
        CatNor in {
 </PRE>
 <P></P>
-<A NAME="toc1"></A>
+<A NAME="toc2"></A>
 <H2>Parameters</H2>
 <P>
 To abstract over gender names, we define the following identifiers.
@@ -125,7 +137,7 @@ Prepositions used in many-argument functions are just strings.
      Preposition : Type = Str ;
 </PRE>
 <P></P>
-<A NAME="toc2"></A>
+<A NAME="toc3"></A>
 <H2>Nouns</H2>
 <P>
 Worst case: give all four forms. The gender is computed from the
@@ -161,13 +173,13 @@ gender is computed from the definite form.
      mk2N : (bil,bilen : Str) -&gt; N ;
 </PRE>
 <P></P>
-<A NAME="toc3"></A>
+<A NAME="toc4"></A>
 <H3>Compound nouns</H3>
 <P>
 All the functions above work quite as well to form compound nouns,
 such as <I>fotboll</I>. 
 </P>
-<A NAME="toc4"></A>
+<A NAME="toc5"></A>
 <H3>Relational nouns</H3>
 <P>
 Relational nouns (<I>daughter of x</I>) need a preposition. 
@@ -195,7 +207,7 @@ Three-place relational nouns (<I>the connection from x to y</I>) need two prepos
      mkN3 : N -&gt; Preposition -&gt; Preposition -&gt; N3 ;
 </PRE>
 <P></P>
-<A NAME="toc5"></A>
+<A NAME="toc6"></A>
 <H3>Relational common noun phrases</H3>
 <P>
 In some cases, you may want to make a complex <CODE>CN</CODE> into a
@@ -203,7 +215,7 @@ relational noun (e.g. <I>the old town hall of</I>). However, <CODE>N2</CODE> and
 <CODE>N3</CODE> are purely lexical categories. But you can use the <CODE>AdvCN</CODE>
 and <CODE>PrepNP</CODE> constructions to build phrases like this.
 </P>
-<A NAME="toc6"></A>
+<A NAME="toc7"></A>
 <H3>Proper names and noun phrases</H3>
 <P>
 Proper names, with a regular genitive, are formed as follows
@@ -227,7 +239,7 @@ genitive, you can use the worst-case function.
      mkNP : Str -&gt; Str -&gt; Number -&gt; Gender -&gt; NP ; 
 </PRE>
 <P></P>
-<A NAME="toc7"></A>
+<A NAME="toc8"></A>
 <H2>Adjectives</H2>
 <P>
 Non-comparison one-place adjectives need three forms: 
@@ -250,7 +262,7 @@ In most cases, two forms are enough.
      mk2A : (stor,stort : Str) -&gt; A ;
 </PRE>
 <P></P>
-<A NAME="toc8"></A>
+<A NAME="toc9"></A>
 <H3>Two-place adjectives</H3>
 <P>
 Two-place adjectives need a preposition for their second argument.
@@ -297,7 +309,7 @@ long adjective, the following pattern is used:
      compoundADeg : A -&gt; A ; -- -/mer/mest norsk
 </PRE>
 <P></P>
-<A NAME="toc9"></A>
+<A NAME="toc10"></A>
 <H2>Adverbs</H2>
 <P>
 Adverbs are not inflected. Most lexical ones have position
@@ -315,7 +327,7 @@ Adverbs modifying adjectives and sentences can also be formed.
      mkAdA : Str -&gt; AdA ;
 </PRE>
 <P></P>
-<A NAME="toc10"></A>
+<A NAME="toc11"></A>
 <H2>Prepositions</H2>
 <P>
 A preposition is just a string.
@@ -324,7 +336,7 @@ A preposition is just a string.
      mkPreposition : Str -&gt; Preposition ;
 </PRE>
 <P></P>
-<A NAME="toc11"></A>
+<A NAME="toc12"></A>
 <H2>Verbs</H2>
 <P>
 The worst case needs six forms.
@@ -355,7 +367,7 @@ In practice, it is enough to give three forms, as in school books.
      irregV : (drikke, drakk, drukket  : Str) -&gt; V ;
 </PRE>
 <P></P>
-<A NAME="toc12"></A>
+<A NAME="toc13"></A>
 <H3>Verbs with a particle.</H3>
 <P>
 The particle, such as in <I>switch on</I>, is given as a string.
@@ -364,7 +376,7 @@ The particle, such as in <I>switch on</I>, is given as a string.
      partV  : V -&gt; Str -&gt; V ;
 </PRE>
 <P></P>
-<A NAME="toc13"></A>
+<A NAME="toc14"></A>
 <H3>Deponent verbs.</H3>
 <P>
 Some words are used in passive forms only, e.g. <I>hoppas</I>, some as
@@ -375,7 +387,7 @@ reflexive e.g. <I>
      reflV : V -&gt; V ;
 </PRE>
 <P></P>
-<A NAME="toc14"></A>
+<A NAME="toc15"></A>
 <H3>Two-place verbs</H3>
 <P>
 Two-place verbs need a preposition, except the special case with direct object.
@@ -387,7 +399,7 @@ Two-place verbs need a preposition, except the special case with direct object.
      dirV2 : V -&gt; V2 ;
 </PRE>
 <P></P>
-<A NAME="toc15"></A>
+<A NAME="toc16"></A>
 <H3>Three-place verbs</H3>
 <P>
 Three-place (ditransitive) verbs need two prepositions, of which
@@ -399,7 +411,7 @@ the first one or both can be absent.
      dirdirV3 : V -&gt; V3 ;                  -- give,_,_
 </PRE>
 <P></P>
-<A NAME="toc16"></A>
+<A NAME="toc17"></A>
 <H3>Other complement patterns</H3>
 <P>
 Verbs and adjectives can take complements such as sentences,
@@ -433,7 +445,7 @@ as an adverb. Likewise <CODE>AS, A2S, AV, A2V</CODE> are just <CODE>A</CODE>.
      AS, A2S, AV, A2V : Type ;
 </PRE>
 <P></P>
-<A NAME="toc17"></A>
+<A NAME="toc18"></A>
 <H2>Definitions of the paradigms</H2>
 <P>
 The definitions should not bother the user of the API. So they are
--- a/lib/resource-1.0/doc/gfdoc/ParadigmsSpa.html
+++ b/lib/resource-1.0/doc/gfdoc/ParadigmsSpa.html
@@ -2,49 +2,61 @@
 <HTML>
 <HEAD>
 <META NAME="generator" CONTENT="http://txt2tags.sf.net">
-<TITLE> Spanish Lexical Paradigms</TITLE>
 </HEAD><BODY BGCOLOR="white" TEXT="black">
-<P ALIGN="center"><CENTER><H1> Spanish Lexical Paradigms</H1>
 <FONT SIZE="4">
-<I>Last update: 2006-03-14 11:21:47 CET</I><BR>
 </FONT></CENTER>

 <P></P>
 <HR NOSHADE SIZE=1>
 <P></P>
+  <UL>
+  <LI><A HREF="#toc1">Spanish Lexical Paradigms</A>
    <UL>
-    <LI><A HREF="#toc1">Parameters</A>
-    <LI><A HREF="#toc2">Nouns</A>
+    <LI><A HREF="#toc2">Parameters</A>
+    <LI><A HREF="#toc3">Nouns</A>
      <UL>
-      <LI><A HREF="#toc3">Compound nouns</A>
-      <LI><A HREF="#toc4">Relational nouns</A>
-      <LI><A HREF="#toc5">Relational common noun phrases</A>
-      <LI><A HREF="#toc6">Proper names and noun phrases</A>
+      <LI><A HREF="#toc4">Compound nouns</A>
+      <LI><A HREF="#toc5">Relational nouns</A>
+      <LI><A HREF="#toc6">Relational common noun phrases</A>
+      <LI><A HREF="#toc7">Proper names and noun phrases</A>
      </UL>
-    <LI><A HREF="#toc7">Adjectives</A>
+    <LI><A HREF="#toc8">Adjectives</A>
      <UL>
-      <LI><A HREF="#toc8">Two-place adjectives</A>
-      <LI><A HREF="#toc9">Comparison adjectives</A>
+      <LI><A HREF="#toc9">Two-place adjectives</A>
+      <LI><A HREF="#toc10">Comparison adjectives</A>
      </UL>
-    <LI><A HREF="#toc10">Adverbs</A>
-    <LI><A HREF="#toc11">Verbs</A>
+    <LI><A HREF="#toc11">Adverbs</A>
+    <LI><A HREF="#toc12">Verbs</A>
      <UL>
-      <LI><A HREF="#toc12">Two-place verbs</A>
-      <LI><A HREF="#toc13">Three-place verbs</A>
-      <LI><A HREF="#toc14">Other complement patterns</A>
+      <LI><A HREF="#toc13">Two-place verbs</A>
+      <LI><A HREF="#toc14">Three-place verbs</A>
+      <LI><A HREF="#toc15">Other complement patterns</A>
      </UL>
-    <LI><A HREF="#toc15">The definitions of the paradigms</A>
+    <LI><A HREF="#toc16">The definitions of the paradigms</A>
    </UL>
+  </UL>

 <P></P>
 <HR NOSHADE SIZE=1>
 <P></P>
 <P>
+Author: 
+Last update: Wed May 24 18:29:15 2006
+</P>
+<P>
 Produced by 
 gfdoc - a rudimentary GF document generator.
 (c) Aarne Ranta (<A HREF="mailto:aarne@cs.chalmers.se">aarne@cs.chalmers.se</A>) 2002 under GNU GPL.
 </P>
 <P>
+==
+</P>
+<P>
+# -path=.:../romance:../common:../abstract:../../prelude
+</P>
+<A NAME="toc1"></A>
+<H1>Spanish Lexical Paradigms</H1>
+<P>
 Aarne Ranta 2003
 </P>
 <P>
@@ -82,7 +94,7 @@ escape to construct the most irregular words of type <CODE>C</CODE>.
      flags optimize=all ;
 </PRE>
 <P></P>
-<A NAME="toc1"></A>
+<A NAME="toc2"></A>
 <H2>Parameters</H2>
 <P>
 To abstract over gender names, we define the following identifiers.
@@ -121,7 +133,7 @@ amalgamate with the following word (the 'genitive' <I>de</I> and the
      mkPreposition : Str -&gt; Preposition ;
 </PRE>
 <P></P>
-<A NAME="toc2"></A>
+<A NAME="toc3"></A>
 <H2>Nouns</H2>
 <P>
 Worst case: two forms (singular + plural),
@@ -152,7 +164,7 @@ To force a different gender, use one of the following functions.
      femN  : N -&gt; N ;
 </PRE>
 <P></P>
-<A NAME="toc3"></A>
+<A NAME="toc4"></A>
 <H3>Compound nouns</H3>
 <P>
 Some nouns are ones where the first part is inflected as a noun but
@@ -164,7 +176,7 @@ they are frequent in lexica.
      compN : N -&gt; Str -&gt; N ;
 </PRE>
 <P></P>
-<A NAME="toc4"></A>
+<A NAME="toc5"></A>
 <H3>Relational nouns</H3>
 <P>
 Relational nouns (<I>fille de x</I>) need a case and a preposition. 
@@ -189,7 +201,7 @@ Three-place relational nouns (<I>la connessione di x a y</I>) need two prepositi
      mkN3 : N -&gt; Preposition -&gt; Preposition -&gt; N3 ;
 </PRE>
 <P></P>
-<A NAME="toc5"></A>
+<A NAME="toc6"></A>
 <H3>Relational common noun phrases</H3>
 <P>
 In some cases, you may want to make a complex <CODE>CN</CODE> into a
@@ -197,7 +209,7 @@ relational noun (e.g. <I>the old town hall of</I>). However, <CODE>N2</CODE> and
 <CODE>N3</CODE> are purely lexical categories. But you can use the <CODE>AdvCN</CODE>
 and <CODE>PrepNP</CODE> constructions to build phrases like this.
 </P>
-<A NAME="toc6"></A>
+<A NAME="toc7"></A>
 <H3>Proper names and noun phrases</H3>
 <P>
 Proper names need a string and a gender.
@@ -214,7 +226,7 @@ you can use the worst-case function.
      mkNP : Str -&gt; Gender -&gt; Number -&gt; NP ; 
 </PRE>
 <P></P>
-<A NAME="toc7"></A>
+<A NAME="toc8"></A>
 <H2>Adjectives</H2>
 <P>
 Non-comparison one-place adjectives need five forms in the worst
@@ -243,7 +255,7 @@ provided.
      prefA : A -&gt; A ;
 </PRE>
 <P></P>
-<A NAME="toc8"></A>
+<A NAME="toc9"></A>
 <H3>Two-place adjectives</H3>
 <P>
 Two-place adjectives need a preposition for their second argument.
@@ -252,7 +264,7 @@ Two-place adjectives need a preposition for their second argument.
      mkA2 : A -&gt; Preposition -&gt; A2 ;
 </PRE>
 <P></P>
-<A NAME="toc9"></A>
+<A NAME="toc10"></A>
 <H3>Comparison adjectives</H3>
 <P>
 Comparison adjectives are in the worst case put up from two
@@ -278,7 +290,7 @@ with comparison by <I>mas</I>.
      regADeg : Str -&gt; A ;
 </PRE>
 <P></P>
-<A NAME="toc10"></A>
+<A NAME="toc11"></A>
 <H2>Adverbs</H2>
 <P>
 Adverbs are not inflected. Most lexical ones have position
@@ -302,7 +314,7 @@ Adverbs modifying adjectives and sentences can also be formed.
      mkAdA : Str -&gt; AdA ;
 </PRE>
 <P></P>
-<A NAME="toc11"></A>
+<A NAME="toc12"></A>
 <H2>Verbs</H2>
 <P>
 Regular verbs are ones inflected like <I>cortar</I>, <I>deber</I>, or <I>vivir</I>.
@@ -338,7 +350,7 @@ in masculine singular form as second argument.
      special_ppV : V -&gt; Str -&gt; V ; 
 </PRE>
 <P></P>
-<A NAME="toc12"></A>
+<A NAME="toc13"></A>
 <H3>Two-place verbs</H3>
 <P>
 Two-place verbs need a preposition, except the special case with direct object.
@@ -357,7 +369,7 @@ You can reuse a <CODE>V2</CODE> verb in <CODE>V</CODE>.
      v2V : V2 -&gt; V ;
 </PRE>
 <P></P>
-<A NAME="toc13"></A>
+<A NAME="toc14"></A>
 <H3>Three-place verbs</H3>
 <P>
 Three-place (ditransitive) verbs need two prepositions, of which
@@ -369,7 +381,7 @@ the first one or both can be absent.
      dirdirV3 : V -&gt; V3 ;                               -- donner,_,_
 </PRE>
 <P></P>
-<A NAME="toc14"></A>
+<A NAME="toc15"></A>
 <H3>Other complement patterns</H3>
 <P>
 Verbs and adjectives can take complements such as sentences,
@@ -405,7 +417,7 @@ as an adverb. Likewise <CODE>AS, A2S, AV, A2V</CODE> are just <CODE>A</CODE>.
      AS, A2S, AV, A2V  : Type ;
 </PRE>
 <P></P>
-<A NAME="toc15"></A>
+<A NAME="toc16"></A>
 <H2>The definitions of the paradigms</H2>
 <P>
 The definitions should not bother the user of the API. So they are
--- a/lib/resource-1.0/doc/gfdoc/ParadigmsSwe.html
+++ b/lib/resource-1.0/doc/gfdoc/ParadigmsSwe.html
@@ -2,51 +2,63 @@
 <HTML>
 <HEAD>
 <META NAME="generator" CONTENT="http://txt2tags.sf.net">
-<TITLE> Swedish Lexical Paradigms</TITLE>
 </HEAD><BODY BGCOLOR="white" TEXT="black">
-<P ALIGN="center"><CENTER><H1> Swedish Lexical Paradigms</H1>
 <FONT SIZE="4">
-<I>Last update: 2006-03-07 21:08:17 CET</I><BR>
 </FONT></CENTER>

 <P></P>
 <HR NOSHADE SIZE=1>
 <P></P>
+  <UL>
+  <LI><A HREF="#toc1">Swedish Lexical Paradigms</A>
    <UL>
-    <LI><A HREF="#toc1">Parameters</A>
-    <LI><A HREF="#toc2">Nouns</A>
+    <LI><A HREF="#toc2">Parameters</A>
+    <LI><A HREF="#toc3">Nouns</A>
      <UL>
-      <LI><A HREF="#toc3">Compound nouns</A>
-      <LI><A HREF="#toc4">Relational nouns</A>
-      <LI><A HREF="#toc5">Relational common noun phrases</A>
-      <LI><A HREF="#toc6">Proper names and noun phrases</A>
+      <LI><A HREF="#toc4">Compound nouns</A>
+      <LI><A HREF="#toc5">Relational nouns</A>
+      <LI><A HREF="#toc6">Relational common noun phrases</A>
+      <LI><A HREF="#toc7">Proper names and noun phrases</A>
      </UL>
-    <LI><A HREF="#toc7">Adjectives</A>
+    <LI><A HREF="#toc8">Adjectives</A>
      <UL>
-      <LI><A HREF="#toc8">Two-place adjectives</A>
+      <LI><A HREF="#toc9">Two-place adjectives</A>
      </UL>
-    <LI><A HREF="#toc9">Adverbs</A>
-    <LI><A HREF="#toc10">Prepositions</A>
-    <LI><A HREF="#toc11">Verbs</A>
+    <LI><A HREF="#toc10">Adverbs</A>
+    <LI><A HREF="#toc11">Prepositions</A>
+    <LI><A HREF="#toc12">Verbs</A>
      <UL>
-      <LI><A HREF="#toc12">Verbs with a particle.</A>
-      <LI><A HREF="#toc13">Deponent verbs.</A>
-      <LI><A HREF="#toc14">Two-place verbs</A>
-      <LI><A HREF="#toc15">Three-place verbs</A>
-      <LI><A HREF="#toc16">Other complement patterns</A>
+      <LI><A HREF="#toc13">Verbs with a particle.</A>
+      <LI><A HREF="#toc14">Deponent verbs.</A>
+      <LI><A HREF="#toc15">Two-place verbs</A>
+      <LI><A HREF="#toc16">Three-place verbs</A>
+      <LI><A HREF="#toc17">Other complement patterns</A>
      </UL>
-    <LI><A HREF="#toc17">Definitions of the paradigms</A>
+    <LI><A HREF="#toc18">Definitions of the paradigms</A>
    </UL>
+  </UL>

 <P></P>
 <HR NOSHADE SIZE=1>
 <P></P>
 <P>
+Author: 
+Last update: Wed May 24 18:29:15 2006
+</P>
+<P>
 Produced by 
 gfdoc - a rudimentary GF document generator.
 (c) Aarne Ranta (<A HREF="mailto:aarne@cs.chalmers.se">aarne@cs.chalmers.se</A>) 2002 under GNU GPL.
 </P>
 <P>
+==
+</P>
+<P>
+# -path=.:../scandinavian:../common:../abstract:../../prelude
+</P>
+<A NAME="toc1"></A>
+<H1>Swedish Lexical Paradigms</H1>
+<P>
 Aarne Ranta 2003
 </P>
 <P>
@@ -84,7 +96,7 @@ words.
        CatSwe in {
 </PRE>
 <P></P>
-<A NAME="toc1"></A>
+<A NAME="toc2"></A>
 <H2>Parameters</H2>
 <P>
 To abstract over gender names, we define the following identifiers.
@@ -124,7 +136,7 @@ Prepositions used in many-argument functions are just strings.
      Preposition : Type = Str ;
 </PRE>
 <P></P>
-<A NAME="toc2"></A>
+<A NAME="toc3"></A>
 <H2>Nouns</H2>
 <P>
 Worst case: give all four forms. The gender is computed from the
@@ -167,13 +179,13 @@ It does not work if there are changes in the stem.
      mk1N : (bilarna : Str) -&gt; N ;
 </PRE>
 <P></P>
-<A NAME="toc3"></A>
+<A NAME="toc4"></A>
 <H3>Compound nouns</H3>
 <P>
 All the functions above work quite as well to form compound nouns,
 such as <I>fotboll</I>. 
 </P>
-<A NAME="toc4"></A>
+<A NAME="toc5"></A>
 <H3>Relational nouns</H3>
 <P>
 Relational nouns (<I>daughter of x</I>) need a preposition. 
@@ -201,7 +213,7 @@ Three-place relational nouns (<I>the connection from x to y</I>) need two prepos
      mkN3 : N -&gt; Preposition -&gt; Preposition -&gt; N3 ;
 </PRE>
 <P></P>
-<A NAME="toc5"></A>
+<A NAME="toc6"></A>
 <H3>Relational common noun phrases</H3>
 <P>
 In some cases, you may want to make a complex <CODE>CN</CODE> into a
@@ -209,7 +221,7 @@ relational noun (e.g. <I>the old town hall of</I>). However, <CODE>N2</CODE> and
 <CODE>N3</CODE> are purely lexical categories. But you can use the <CODE>AdvCN</CODE>
 and <CODE>PrepNP</CODE> constructions to build phrases like this.
 </P>
-<A NAME="toc6"></A>
+<A NAME="toc7"></A>
 <H3>Proper names and noun phrases</H3>
 <P>
 Proper names, with a regular genitive, are formed as follows
@@ -233,7 +245,7 @@ genitive, you can use the worst-case function.
      mkNP : Str -&gt; Str -&gt; Number -&gt; Gender -&gt; NP ; 
 </PRE>
 <P></P>
-<A NAME="toc7"></A>
+<A NAME="toc8"></A>
 <H2>Adjectives</H2>
 <P>
 Adjectives may need as many as seven forms. 
@@ -265,7 +277,7 @@ Sometimes just the positive forms are irregular.
      mk2A : (bred,brett        : Str) -&gt; A ;
 </PRE>
 <P></P>
-<A NAME="toc8"></A>
+<A NAME="toc9"></A>
 <H3>Two-place adjectives</H3>
 <P>
 Two-place adjectives need a preposition for their second argument.
@@ -274,7 +286,7 @@ Two-place adjectives need a preposition for their second argument.
      mkA2 : A -&gt; Preposition -&gt; A2 ;
 </PRE>
 <P></P>
-<A NAME="toc9"></A>
+<A NAME="toc10"></A>
 <H2>Adverbs</H2>
 <P>
 Adverbs are not inflected. Most lexical ones have position
@@ -292,7 +304,7 @@ Adverbs modifying adjectives and sentences can also be formed.
      mkAdA : Str -&gt; AdA ;
 </PRE>
 <P></P>
-<A NAME="toc10"></A>
+<A NAME="toc11"></A>
 <H2>Prepositions</H2>
 <P>
 A preposition is just a string.
@@ -301,7 +313,7 @@ A preposition is just a string.
      mkPreposition : Str -&gt; Preposition ;
 </PRE>
 <P></P>
-<A NAME="toc11"></A>
+<A NAME="toc12"></A>
 <H2>Verbs</H2>
 <P>
 The worst case needs five forms.
@@ -339,7 +351,7 @@ In practice, it is enough to give three forms, as in school books.
      irregV : (dricka, drack, druckit : Str) -&gt; V ;
 </PRE>
 <P></P>
-<A NAME="toc12"></A>
+<A NAME="toc13"></A>
 <H3>Verbs with a particle.</H3>
 <P>
 The particle, such as in <I>passa på</I>, is given as a string.
@@ -348,7 +360,7 @@ The particle, such as in <I>passa p
      partV  : V -&gt; Str -&gt; V ;
 </PRE>
 <P></P>
-<A NAME="toc13"></A>
+<A NAME="toc14"></A>
 <H3>Deponent verbs.</H3>
 <P>
 Some words are used in passive forms only, e.g. <I>hoppas</I>, some as
@@ -359,7 +371,7 @@ reflexive e.g. <I>
      reflV : V -&gt; V ;
 </PRE>
 <P></P>
-<A NAME="toc14"></A>
+<A NAME="toc15"></A>
 <H3>Two-place verbs</H3>
 <P>
 Two-place verbs need a preposition, except the special case with direct object.
@@ -371,7 +383,7 @@ Two-place verbs need a preposition, except the special case with direct object.
      dirV2 : V -&gt; V2 ;
 </PRE>
 <P></P>
-<A NAME="toc15"></A>
+<A NAME="toc16"></A>
 <H3>Three-place verbs</H3>
 <P>
 Three-place (ditransitive) verbs need two prepositions, of which
@@ -383,7 +395,7 @@ the first one or both can be absent.
      dirdirV3 : V -&gt; V3 ;                               -- ge _ _
 </PRE>
 <P></P>
-<A NAME="toc16"></A>
+<A NAME="toc17"></A>
 <H3>Other complement patterns</H3>
 <P>
 Verbs and adjectives can take complements such as sentences,
@@ -417,7 +429,7 @@ as an adverb. Likewise <CODE>AS, A2S, AV, A2V</CODE> are just <CODE>A</CODE>.
      AS, A2S, AV, A2V : Type ;
 </PRE>
 <P></P>
-<A NAME="toc17"></A>
+<A NAME="toc18"></A>
 <H2>Definitions of the paradigms</H2>
 <P>
 The definitions should not bother the user of the API. So they are
--- a/lib/resource-1.0/doc/gfdoc/Phrase.html
+++ b/lib/resource-1.0/doc/gfdoc/Phrase.html
@@ -6,12 +6,17 @@
 </HEAD><BODY BGCOLOR="white" TEXT="black">
 <P ALIGN="center"><CENTER><H1> Phrases and utterances</H1>
 <FONT SIZE="4">
-<I>Last update: 2006-01-25 20:10:39 CET</I><BR>
+<I>Author: </I><BR>
+Last update: Wed May 24 18:29:12 2006
 </FONT></CENTER>

 <P></P>
 <HR NOSHADE SIZE=1>
 <P></P>
+  <UL>
+  <LI><A HREF="#toc1">Phrases and utterances</A>
+  </UL>
+
 <P></P>
 <HR NOSHADE SIZE=1>
 <P></P>
@@ -20,6 +25,8 @@ Produced by
 gfdoc - a rudimentary GF document generator.
 (c) Aarne Ranta (<A HREF="mailto:aarne@cs.chalmers.se">aarne@cs.chalmers.se</A>) 2002 under GNU GPL.
 </P>
+<A NAME="toc1"></A>
+<H1>Phrases and utterances</H1>
 <PRE>
    abstract Phrase = Cat ** {
 </PRE>
--- a/lib/resource-1.0/doc/gfdoc/Precedence.html
+++ b/lib/resource-1.0/doc/gfdoc/Precedence.html
@@ -13,7 +13,8 @@
 <HR NOSHADE SIZE=1>
 <P></P>
 <P>
-Last update: 2005-11-17 17:36:49 CET
+Author: 
+Last update: Wed May 24 18:29:16 2006
 </P>
 <P>
 Produced by 
@@ -21,6 +22,9 @@ gfdoc - a rudimentary GF document generator.
 (c) Aarne Ranta (<A HREF="mailto:aarne@cs.chalmers.se">aarne@cs.chalmers.se</A>) 2002 under GNU GPL.
 </P>
 <P>
+==
+</P>
+<P>
 operations for precedence-dependent strings.
 five levels: 
 p4 (constants), p3 (applications), p2 (products), p1 (sums), p0 (arrows)
--- a/lib/resource-1.0/doc/gfdoc/Predef.html
+++ b/lib/resource-1.0/doc/gfdoc/Predef.html
@@ -6,12 +6,17 @@
 </HEAD><BODY BGCOLOR="white" TEXT="black">
 <P ALIGN="center"><CENTER><H1> Predefined functions for concrete syntax</H1>
 <FONT SIZE="4">
-<I>Last update: 2006-02-25 22:19:20 CET</I><BR>
+<I>Author: </I><BR>
+Last update: Wed May 24 18:29:17 2006
 </FONT></CENTER>

 <P></P>
 <HR NOSHADE SIZE=1>
 <P></P>
+  <UL>
+  <LI><A HREF="#toc1">Predefined functions for concrete syntax</A>
+  </UL>
+
 <P></P>
 <HR NOSHADE SIZE=1>
 <P></P>
@@ -20,6 +25,8 @@ Produced by
 gfdoc - a rudimentary GF document generator.
 (c) Aarne Ranta (<A HREF="mailto:aarne@cs.chalmers.se">aarne@cs.chalmers.se</A>) 2002 under GNU GPL.
 </P>
+<A NAME="toc1"></A>
+<H1>Predefined functions for concrete syntax</H1>
 <P>
 The definitions of these constants are hard-coded in GF, and defined
 in <A HREF="../src/GF/Grammar/AppPredefined.hs">AppPredefined.hs</A>. Applying
--- a/lib/resource-1.0/doc/gfdoc/PredefAbs.html
+++ b/lib/resource-1.0/doc/gfdoc/PredefAbs.html
@@ -13,13 +13,17 @@
 <HR NOSHADE SIZE=1>
 <P></P>
 <P>
-Last update: 2005-11-17 17:36:49 CET
+Author: 
+Last update: Wed May 24 18:29:17 2006
 </P>
 <P>
 Produced by 
 gfdoc - a rudimentary GF document generator.
 (c) Aarne Ranta (<A HREF="mailto:aarne@cs.chalmers.se">aarne@cs.chalmers.se</A>) 2002 under GNU GPL.
 </P>
+<P>
+==
+</P>
 <PRE>
    abstract PredefAbs = {
      cat Int ; String ;
--- a/lib/resource-1.0/doc/gfdoc/Predication.html
+++ b/lib/resource-1.0/doc/gfdoc/Predication.html
@@ -6,20 +6,24 @@
 </HEAD><BODY BGCOLOR="white" TEXT="black">
 <P ALIGN="center"><CENTER><H1> A Small Predication Library</H1>
 <FONT SIZE="4">
-<I>Last update: 2006-02-25 23:46:32 CET</I><BR>
+<I>Author: </I><BR>
+Last update: Wed May 24 18:29:16 2006
 </FONT></CENTER>

 <P></P>
 <HR NOSHADE SIZE=1>
 <P></P>
+  <UL>
+  <LI><A HREF="#toc1">A Small Predication Library</A>
    <UL>
-    <LI><A HREF="#toc1">The category of atomic sentences</A>
-    <LI><A HREF="#toc2">Predication patterns.</A>
-    <LI><A HREF="#toc3">Imperatives and infinitives.</A>
-    <LI><A HREF="#toc4">Individual-valued function applications</A>
-    <LI><A HREF="#toc5">Families of types</A>
-    <LI><A HREF="#toc6">Type constructor</A>
+    <LI><A HREF="#toc2">The category of atomic sentences</A>
+    <LI><A HREF="#toc3">Predication patterns.</A>
+    <LI><A HREF="#toc4">Imperatives and infinitives.</A>
+    <LI><A HREF="#toc5">Individual-valued function applications</A>
+    <LI><A HREF="#toc6">Families of types</A>
+    <LI><A HREF="#toc7">Type constructor</A>
    </UL>
+  </UL>

 <P></P>
 <HR NOSHADE SIZE=1>
@@ -29,6 +33,8 @@ Produced by
 gfdoc - a rudimentary GF document generator.
 (c) Aarne Ranta (<A HREF="mailto:aarne@cs.chalmers.se">aarne@cs.chalmers.se</A>) 2002 under GNU GPL.
 </P>
+<A NAME="toc1"></A>
+<H1>A Small Predication Library</H1>
 <P>
 (c) Aarne Ranta 2003-2006 under Gnu GPL.
 </P>
@@ -40,7 +46,7 @@ API of resource grammars.
    abstract Predication = Cat ** {
 </PRE>
 <P></P>
-<A NAME="toc1"></A>
+<A NAME="toc2"></A>
 <H2>The category of atomic sentences</H2>
 <P>
 We want to use sentences in positive and negative forms but do not care about
@@ -52,7 +58,7 @@ tenses.
      NegCl     : Cl -&gt; S ;                -- negative sentence:   "x doesn't intersect y"
 </PRE>
 <P></P>
-<A NAME="toc2"></A>
+<A NAME="toc3"></A>
 <H2>Predication patterns.</H2>
 <PRE>
      predV     : V  -&gt; NP -&gt; Cl ;         -- one-place verb:      "x converges"
@@ -70,14 +76,14 @@ tenses.
      predPrep  : Prep -&gt; NP -&gt; NP -&gt; Cl ; -- preposition:         "x is outside y"
 </PRE>
 <P></P>
-<A NAME="toc3"></A>
+<A NAME="toc4"></A>
 <H2>Imperatives and infinitives.</H2>
 <PRE>
      impV2     : V2 -&gt; NP -&gt; Phr ;        -- imperative:          "solve the equation E"
      infV2     : V2 -&gt; NP -&gt; Phr ;        -- infinitive:          "to solve the equation E"
 </PRE>
 <P></P>
-<A NAME="toc4"></A>
+<A NAME="toc5"></A>
 <H2>Individual-valued function applications</H2>
 <PRE>
      appN2     : N2 -&gt; NP -&gt; NP ;         -- one-place function:  "the successor of x"
@@ -85,7 +91,7 @@ tenses.
      appColl   : N2 -&gt; NP -&gt; NP -&gt; NP ;   -- collective function: "the sum of x and y"
 </PRE>
 <P></P>
-<A NAME="toc5"></A>
+<A NAME="toc6"></A>
 <H2>Families of types</H2>
 <P>
 These are expressed by relational nouns applied to arguments.
@@ -96,7 +102,7 @@ These are expressed by relational nouns applied to arguments.
      famColl   : N2 -&gt; NP -&gt; NP -&gt; CN ;   -- collective family:   "path between x and y"
 </PRE>
 <P></P>
-<A NAME="toc6"></A>
+<A NAME="toc7"></A>
 <H2>Type constructor</H2>
 <P>
 This is similar to a family except that the argument is a type.
--- a/lib/resource-1.0/doc/gfdoc/Prelude.html
+++ b/lib/resource-1.0/doc/gfdoc/Prelude.html
@@ -6,21 +6,25 @@
 </HEAD><BODY BGCOLOR="white" TEXT="black">
 <P ALIGN="center"><CENTER><H1> The GF Prelude</H1>
 <FONT SIZE="4">
-<I>Last update: 2006-02-25 22:31:06 CET</I><BR>
+<I>Author: </I><BR>
+Last update: Wed May 24 18:29:17 2006
 </FONT></CENTER>

 <P></P>
 <HR NOSHADE SIZE=1>
 <P></P>
+  <UL>
+  <LI><A HREF="#toc1">The GF Prelude</A>
    <UL>
-    <LI><A HREF="#toc1">Strings, records, and tables</A>
-    <LI><A HREF="#toc2">Optional elements</A>
-    <LI><A HREF="#toc3">Infixes. prefixes, and postfixes</A>
-    <LI><A HREF="#toc4">Booleans</A>
-    <LI><A HREF="#toc5">High-level acces to Predef operations</A>
-    <LI><A HREF="#toc6">Lexer-related operations</A>
-    <LI><A HREF="#toc7">Miscellaneous</A>
+    <LI><A HREF="#toc2">Strings, records, and tables</A>
+    <LI><A HREF="#toc3">Optional elements</A>
+    <LI><A HREF="#toc4">Infixes. prefixes, and postfixes</A>
+    <LI><A HREF="#toc5">Booleans</A>
+    <LI><A HREF="#toc6">High-level acces to Predef operations</A>
+    <LI><A HREF="#toc7">Lexer-related operations</A>
+    <LI><A HREF="#toc8">Miscellaneous</A>
    </UL>
+  </UL>

 <P></P>
 <HR NOSHADE SIZE=1>
@@ -30,6 +34,8 @@ Produced by
 gfdoc - a rudimentary GF document generator.
 (c) Aarne Ranta (<A HREF="mailto:aarne@cs.chalmers.se">aarne@cs.chalmers.se</A>) 2002 under GNU GPL.
 </P>
+<A NAME="toc1"></A>
+<H1>The GF Prelude</H1>
 <P>
 This file defines some prelude facilities usable in all grammars.
 </P>
@@ -39,7 +45,7 @@ This file defines some prelude facilities usable in all grammars.
    oper
 </PRE>
 <P></P>
-<A NAME="toc1"></A>
+<A NAME="toc2"></A>
 <H2>Strings, records, and tables</H2>
 <PRE>
      SS  : Type = {s : Str} ;
@@ -68,7 +74,7 @@ Discontinuous constituents.
      sd2 : (_,_ : Str) -&gt; SD2 = \x,y -&gt; {s1 = x ; s2 = y} ;
 </PRE>
 <P></P>
-<A NAME="toc2"></A>
+<A NAME="toc3"></A>
 <H2>Optional elements</H2>
 <P>
 Missing form.
@@ -100,7 +106,7 @@ Parametric order between two strings.
        if_then_Str pr (x ++ y) (y ++ x) ;
 </PRE>
 <P></P>
-<A NAME="toc3"></A>
+<A NAME="toc4"></A>
 <H2>Infixes. prefixes, and postfixes</H2>
 <P>
 Fixes with precedences are defined in <A HREF="Precedence.html">Precedence</A>.
@@ -112,7 +118,7 @@ Fixes with precedences are defined in <A HREF="Precedence.html">Precedence</A>.
      embedSS   : Str -&gt; Str -&gt; SS -&gt; SS = \f,g,x -&gt; ss (f ++ x.s ++ g) ;
 </PRE>
 <P></P>
-<A NAME="toc4"></A>
+<A NAME="toc5"></A>
 <H2>Booleans</H2>
 <PRE>
     param Bool = True | False ;
@@ -148,7 +154,7 @@ Interface to internal booleans
      last : Tok -&gt; Tok = Predef.dp 1 ;
 </PRE>
 <P></P>
-<A NAME="toc5"></A>
+<A NAME="toc6"></A>
 <H2>High-level acces to Predef operations</H2>
 <PRE>
      isNil : Tok -&gt; Bool = \b -&gt; pbool2bool (Predef.eqStr [] b) ;
@@ -157,7 +163,7 @@ Interface to internal booleans
        case Predef.eqStr t u of {Predef.PTrue =&gt; a ; Predef.PFalse =&gt; b} ;
 </PRE>
 <P></P>
-<A NAME="toc6"></A>
+<A NAME="toc7"></A>
 <H2>Lexer-related operations</H2>
 <P>
 Bind together two tokens in some lexers, either obligatorily or optionally
@@ -185,7 +191,7 @@ These should be hidden, and never changed since they are hardcoded in (un)lexers
        CAPIT : Str = "&amp;|" ;
 </PRE>
 <P></P>
-<A NAME="toc7"></A>
+<A NAME="toc8"></A>
 <H2>Miscellaneous</H2>
 <P>
 Identity function
--- a/lib/resource-1.0/doc/gfdoc/Question.html
+++ b/lib/resource-1.0/doc/gfdoc/Question.html
@@ -6,12 +6,17 @@
 </HEAD><BODY BGCOLOR="white" TEXT="black">
 <P ALIGN="center"><CENTER><H1> Questions and interrogative pronouns</H1>
 <FONT SIZE="4">
-<I>Last update: 2006-04-20 21:45:11 CEST</I><BR>
+<I>Author: </I><BR>
+Last update: Wed May 24 18:29:12 2006
 </FONT></CENTER>

 <P></P>
 <HR NOSHADE SIZE=1>
 <P></P>
+  <UL>
+  <LI><A HREF="#toc1">Questions and interrogative pronouns</A>
+  </UL>
+
 <P></P>
 <HR NOSHADE SIZE=1>
 <P></P>
@@ -20,6 +25,8 @@ Produced by
 gfdoc - a rudimentary GF document generator.
 (c) Aarne Ranta (<A HREF="mailto:aarne@cs.chalmers.se">aarne@cs.chalmers.se</A>) 2002 under GNU GPL.
 </P>
+<A NAME="toc1"></A>
+<H1>Questions and interrogative pronouns</H1>
 <PRE>
    abstract Question = Cat ** {
 </PRE>
--- a/lib/resource-1.0/doc/gfdoc/Relative.html
+++ b/lib/resource-1.0/doc/gfdoc/Relative.html
@@ -6,12 +6,17 @@
 </HEAD><BODY BGCOLOR="white" TEXT="black">
 <P ALIGN="center"><CENTER><H1> Relative clauses and pronouns</H1>
 <FONT SIZE="4">
-<I>Last update: 2006-01-17 17:56:17 CET</I><BR>
+<I>Author: </I><BR>
+Last update: Wed May 24 18:29:13 2006
 </FONT></CENTER>

 <P></P>
 <HR NOSHADE SIZE=1>
 <P></P>
+  <UL>
+  <LI><A HREF="#toc1">Relative clauses and pronouns</A>
+  </UL>
+
 <P></P>
 <HR NOSHADE SIZE=1>
 <P></P>
@@ -20,6 +25,8 @@ Produced by
 gfdoc - a rudimentary GF document generator.
 (c) Aarne Ranta (<A HREF="mailto:aarne@cs.chalmers.se">aarne@cs.chalmers.se</A>) 2002 under GNU GPL.
 </P>
+<A NAME="toc1"></A>
+<H1>Relative clauses and pronouns</H1>
 <PRE>
    abstract Relative = Cat ** {
    
--- a/lib/resource-1.0/doc/gfdoc/Sentence.html
+++ b/lib/resource-1.0/doc/gfdoc/Sentence.html
@@ -6,19 +6,23 @@
 </HEAD><BODY BGCOLOR="white" TEXT="black">
 <P ALIGN="center"><CENTER><H1> Sentences, clauses, imperatives, and sentential complements</H1>
 <FONT SIZE="4">
-<I>Last update: 2006-01-25 20:10:39 CET</I><BR>
+<I>Author: </I><BR>
+Last update: Wed May 24 18:29:13 2006
 </FONT></CENTER>

 <P></P>
 <HR NOSHADE SIZE=1>
 <P></P>
+  <UL>
+  <LI><A HREF="#toc1">Sentences, clauses, imperatives, and sentential complements</A>
    <UL>
-    <LI><A HREF="#toc1">Clauses</A>
-    <LI><A HREF="#toc2">Clauses missing object noun phrases</A>
-    <LI><A HREF="#toc3">Imperatives</A>
-    <LI><A HREF="#toc4">Embedded sentences</A>
-    <LI><A HREF="#toc5">Sentences</A>
+    <LI><A HREF="#toc2">Clauses</A>
+    <LI><A HREF="#toc3">Clauses missing object noun phrases</A>
+    <LI><A HREF="#toc4">Imperatives</A>
+    <LI><A HREF="#toc5">Embedded sentences</A>
+    <LI><A HREF="#toc6">Sentences</A>
    </UL>
+  </UL>

 <P></P>
 <HR NOSHADE SIZE=1>
@@ -28,11 +32,13 @@ Produced by
 gfdoc - a rudimentary GF document generator.
 (c) Aarne Ranta (<A HREF="mailto:aarne@cs.chalmers.se">aarne@cs.chalmers.se</A>) 2002 under GNU GPL.
 </P>
+<A NAME="toc1"></A>
+<H1>Sentences, clauses, imperatives, and sentential complements</H1>
 <PRE>
    abstract Sentence = Cat ** {
 </PRE>
 <P></P>
-<A NAME="toc1"></A>
+<A NAME="toc2"></A>
 <H2>Clauses</H2>
 <P>
 The <CODE>NP VP</CODE> predication rule form a clause whose linearization
@@ -53,7 +59,7 @@ is only meaningful for some verb phrases.
        PredSCVP  : SC -&gt; VP -&gt; Cl ;         -- that you go makes me happy
 </PRE>
 <P></P>
-<A NAME="toc2"></A>
+<A NAME="toc3"></A>
 <H2>Clauses missing object noun phrases</H2>
 <P>
 This category is a variant of the 'slash category' <CODE>S/NP</CODE> of
@@ -71,7 +77,7 @@ the style of CCG.
        SlashPrep : Cl -&gt; Prep -&gt; Slash ;    -- (with whom) he walks 
 </PRE>
 <P></P>
-<A NAME="toc3"></A>
+<A NAME="toc4"></A>
 <H2>Imperatives</H2>
 <P>
 An imperative is straightforwardly formed from a verb phrase.
@@ -82,7 +88,7 @@ To fix these parameters, see <A HREF="Phrase.html">Phrase</A>.
        ImpVP     : VP -&gt; Imp ;              -- go
 </PRE>
 <P></P>
-<A NAME="toc4"></A>
+<A NAME="toc5"></A>
 <H2>Embedded sentences</H2>
 <P>
 Sentences, questions, and infinitival phrases can be used as
@@ -94,7 +100,7 @@ subjects and (adverbial) complements.
        EmbedVP   : VP -&gt; SC ;               -- to go
 </PRE>
 <P></P>
-<A NAME="toc5"></A>
+<A NAME="toc6"></A>
 <H2>Sentences</H2>
 <P>
 These are the 2 x 4 x 4 = 16 forms generated by different
--- a/lib/resource-1.0/doc/gfdoc/Structural.html
+++ b/lib/resource-1.0/doc/gfdoc/Structural.html
@@ -6,12 +6,17 @@
 </HEAD><BODY BGCOLOR="white" TEXT="black">
 <P ALIGN="center"><CENTER><H1> GF Resource Grammar API for Structural Words</H1>
 <FONT SIZE="4">
-<I>Last update: 2006-03-07 21:08:18 CET</I><BR>
+<I>Author: </I><BR>
+Last update: Wed May 24 18:29:13 2006
 </FONT></CENTER>

 <P></P>
 <HR NOSHADE SIZE=1>
 <P></P>
+  <UL>
+  <LI><A HREF="#toc1">GF Resource Grammar API for Structural Words</A>
+  </UL>
+
 <P></P>
 <HR NOSHADE SIZE=1>
 <P></P>
@@ -20,13 +25,15 @@ Produced by
 gfdoc - a rudimentary GF document generator.
 (c) Aarne Ranta (<A HREF="mailto:aarne@cs.chalmers.se">aarne@cs.chalmers.se</A>) 2002 under GNU GPL.
 </P>
+<A NAME="toc1"></A>
+<H1>GF Resource Grammar API for Structural Words</H1>
 <P>
 AR 21/11/2003 -- 30/11/2005
 </P>
 <P>
 Here we have some words belonging to closed classes and appearing
 in all languages we have considered.
-Sometimes they are not really meaningful, e.g. <CODE>we_NP</CODE> in Spanish
+Sometimes they are not really meaningful, e.g. <CODE>we_Pron</CODE> in Spanish
 should be replaced by masculine and feminine variants.
 </P>
 <PRE>
--- a/lib/resource-1.0/doc/gfdoc/Symbol.html
+++ b/lib/resource-1.0/doc/gfdoc/Symbol.html
@@ -6,17 +6,21 @@
 </HEAD><BODY BGCOLOR="white" TEXT="black">
 <P ALIGN="center"><CENTER><H1> Symbolic expressions</H1>
 <FONT SIZE="4">
-<I>Last update: 2006-03-17 12:02:40 CET</I><BR>
+<I>Author: </I><BR>
+Last update: Wed May 24 18:29:16 2006
 </FONT></CENTER>

 <P></P>
 <HR NOSHADE SIZE=1>
 <P></P>
+  <UL>
+  <LI><A HREF="#toc1">Symbolic expressions</A>
    <UL>
-    <LI><A HREF="#toc1">Noun phrases with symbols and numbers</A>
-    <LI><A HREF="#toc2">Sentence consisting of a formula</A>
-    <LI><A HREF="#toc3">Symbol lists</A>
+    <LI><A HREF="#toc2">Noun phrases with symbols and numbers</A>
+    <LI><A HREF="#toc3">Sentence consisting of a formula</A>
+    <LI><A HREF="#toc4">Symbol lists</A>
    </UL>
+  </UL>

 <P></P>
 <HR NOSHADE SIZE=1>
@@ -26,6 +30,8 @@ Produced by
 gfdoc - a rudimentary GF document generator.
 (c) Aarne Ranta (<A HREF="mailto:aarne@cs.chalmers.se">aarne@cs.chalmers.se</A>) 2002 under GNU GPL.
 </P>
+<A NAME="toc1"></A>
+<H1>Symbolic expressions</H1>
 <P>
 <B>Note</B>. This module is not automatically included in the main
 grammar <A HREF="Lang.html">Lang</A>.
@@ -34,7 +40,7 @@ grammar <A HREF="Lang.html">Lang</A>.
    abstract Symbol = Cat, PredefAbs ** {
 </PRE>
 <P></P>
-<A NAME="toc1"></A>
+<A NAME="toc2"></A>
 <H2>Noun phrases with symbols and numbers</H2>
 <PRE>
    fun
@@ -46,13 +52,13 @@ grammar <A HREF="Lang.html">Lang</A>.
      CNSymbNP : Det -&gt; CN -&gt; [Symb] -&gt; NP ; -- (the) (2) numbers x and y
 </PRE>
 <P></P>
-<A NAME="toc2"></A>
+<A NAME="toc3"></A>
 <H2>Sentence consisting of a formula</H2>
 <PRE>
      SymbS    : Symb -&gt; S ;                 -- A
 </PRE>
 <P></P>
-<A NAME="toc3"></A>
+<A NAME="toc4"></A>
 <H2>Symbol lists</H2>
 <P>
 A symbol list has at least two elements. The last two are separated
--- a/lib/resource-1.0/doc/gfdoc/Tense.html
+++ b/lib/resource-1.0/doc/gfdoc/Tense.html
@@ -6,12 +6,17 @@
 </HEAD><BODY BGCOLOR="white" TEXT="black">
 <P ALIGN="center"><CENTER><H1> Tense, Polarity, and Anteriority</H1>
 <FONT SIZE="4">
-<I>Last update: 2006-02-26 18:06:25 CET</I><BR>
+<I>Author: </I><BR>
+Last update: Wed May 24 18:29:13 2006
 </FONT></CENTER>

 <P></P>
 <HR NOSHADE SIZE=1>
 <P></P>
+  <UL>
+  <LI><A HREF="#toc1">Tense, Polarity, and Anteriority</A>
+  </UL>
+
 <P></P>
 <HR NOSHADE SIZE=1>
 <P></P>
@@ -20,6 +25,8 @@ Produced by
 gfdoc - a rudimentary GF document generator.
 (c) Aarne Ranta (<A HREF="mailto:aarne@cs.chalmers.se">aarne@cs.chalmers.se</A>) 2002 under GNU GPL.
 </P>
+<A NAME="toc1"></A>
+<H1>Tense, Polarity, and Anteriority</H1>
 <P>
 This module defines the abstract parameters of tense, polarity, and
 anteriority, which are used in <A HREF="Tensed.html">Tensed</A> to generate different
--- a/lib/resource-1.0/doc/gfdoc/Text.html
+++ b/lib/resource-1.0/doc/gfdoc/Text.html
@@ -6,12 +6,17 @@
 </HEAD><BODY BGCOLOR="white" TEXT="black">
 <P ALIGN="center"><CENTER><H1> Texts</H1>
 <FONT SIZE="4">
-<I>Last update: 2006-02-20 20:02:47 CET</I><BR>
+<I>Author: </I><BR>
+Last update: Wed May 24 18:29:13 2006
 </FONT></CENTER>

 <P></P>
 <HR NOSHADE SIZE=1>
 <P></P>
+  <UL>
+  <LI><A HREF="#toc1">Texts</A>
+  </UL>
+
 <P></P>
 <HR NOSHADE SIZE=1>
 <P></P>
@@ -20,8 +25,10 @@ Produced by
 gfdoc - a rudimentary GF document generator.
 (c) Aarne Ranta (<A HREF="mailto:aarne@cs.chalmers.se">aarne@cs.chalmers.se</A>) 2002 under GNU GPL.
 </P>
+<A NAME="toc1"></A>
+<H1>Texts</H1>
 <PRE>
-    abstract Text = Cat ** {
+    abstract Text = Common ** {
    
      fun
        TEmpty : Text ;
--- a/lib/resource-1.0/doc/gfdoc/Verb.html
+++ b/lib/resource-1.0/doc/gfdoc/Verb.html
@@ -6,18 +6,22 @@
 </HEAD><BODY BGCOLOR="white" TEXT="black">
 <P ALIGN="center"><CENTER><H1> The construction of verb phrases</H1>
 <FONT SIZE="4">
-<I>Last update: 2006-02-26 18:02:58 CET</I><BR>
+<I>Author: </I><BR>
+Last update: Wed May 24 18:29:13 2006
 </FONT></CENTER>

 <P></P>
 <HR NOSHADE SIZE=1>
 <P></P>
+  <UL>
+  <LI><A HREF="#toc1">The construction of verb phrases</A>
    <UL>
-    <LI><A HREF="#toc1">Complementization rules</A>
-    <LI><A HREF="#toc2">Other ways of forming verb phrases</A>
-    <LI><A HREF="#toc3">Complements to copula</A>
-    <LI><A HREF="#toc4">Coercions</A>
+    <LI><A HREF="#toc2">Complementization rules</A>
+    <LI><A HREF="#toc3">Other ways of forming verb phrases</A>
+    <LI><A HREF="#toc4">Complements to copula</A>
+    <LI><A HREF="#toc5">Coercions</A>
    </UL>
+  </UL>

 <P></P>
 <HR NOSHADE SIZE=1>
@@ -27,11 +31,13 @@ Produced by
 gfdoc - a rudimentary GF document generator.
 (c) Aarne Ranta (<A HREF="mailto:aarne@cs.chalmers.se">aarne@cs.chalmers.se</A>) 2002 under GNU GPL.
 </P>
+<A NAME="toc1"></A>
+<H1>The construction of verb phrases</H1>
 <PRE>
    abstract Verb = Cat ** {
 </PRE>
 <P></P>
-<A NAME="toc1"></A>
+<A NAME="toc2"></A>
 <H2>Complementization rules</H2>
 <P>
 Verb phrases are constructed from verbs by providing their
@@ -51,7 +57,7 @@ complements. There is one rule for each verb category.
        ComplV2A : V2A -&gt; NP -&gt; AP -&gt; VP ;  -- paint the house red
 </PRE>
 <P></P>
-<A NAME="toc2"></A>
+<A NAME="toc3"></A>
 <H2>Other ways of forming verb phrases</H2>
 <P>
 Verb phrases can also be constructed reflexively and from
@@ -92,7 +98,7 @@ vs. next to (or before) the verb.
 <B>Agents of passives</B> are constructed as adverbs with the
 preposition <A HREF="Structural.html">Structural</A><CODE>.8agent_Prep</CODE>.
 </P>
-<A NAME="toc3"></A>
+<A NAME="toc4"></A>
 <H2>Complements to copula</H2>
 <P>
 Adjectival phrases, noun phrases, and adverbs can be used.
@@ -103,7 +109,7 @@ Adjectival phrases, noun phrases, and adverbs can be used.
        CompAdv  : Adv -&gt; Comp ;            -- (be) here
 </PRE>
 <P></P>
-<A NAME="toc4"></A>
+<A NAME="toc5"></A>
 <H2>Coercions</H2>
 <P>
 Verbs can change subcategorization patterns in systematic ways,
--- a/lib/resource-1.0/doc/index.txt
+++ b/lib/resource-1.0/doc/index.txt
@@ -172,8 +172,7 @@ sufficient for many applications.

 ====Multimodal====

- [Multimodal gfdoc/Multimodal.html]: main module for multimodal dialogue systems
- [Demonstrative gfdoc/Demonstrative.html]: demonstrative noun phrases and adverbs
+- [Multi gfdoc/Multi.html]: main module for multimodal dialogue systems


 ====Mathematical====
--- a/lib/resource-1.0/multimodal/MultiI.gf
+++ b/lib/resource-1.0/multimodal/MultiI.gf
@@ -12,6 +12,8 @@ incomplete concrete MultiI of Multi =
    ] 
  ** open (Lang = Lang) in {

+  flags optimize = all_subs ;
+
  lincat 
    NP  = Lang.NP  ** {point : Str} ;
    Adv = Lang.Adv ** {point : Str} ;
@@ -158,15 +160,15 @@ incomplete concrete MultiI of Multi =

 --3 Demonstratives

-    this8point_NP p = LangEng.this_NP ** p ;
-    that8point_NP p = LangEng.that_NP ** p ;
-    these8point_NP p = LangEng.these_NP ** p ;
-    those8point_NP p = LangEng.those_NP ** p ;
+    this8point_NP p = Lang.this_NP ** p ;
+    that8point_NP p = Lang.that_NP ** p ;
+    these8point_NP p = Lang.these_NP ** p ;
+    those8point_NP p = Lang.those_NP ** p ;
    here8point_Adv p = Lang.here_Adv ** p ;
    here7to8point_Adv p = Lang.here7to_Adv ** p ;
    here7from8point_Adv p = Lang.here7from_Adv ** p ;
-    this8point_Quant p = LangEng.this_Quant ** p ;
-    that8point_Quant p = LangEng.that_Quant ** p ;
+    this8point_Quant p = Lang.this_Quant ** p ;
+    that8point_Quant p = Lang.that_Quant ** p ;


    MkPoint s = {point = s.s} ;
@@ -174,4 +176,4 @@ incomplete concrete MultiI of Multi =
  oper
    noPoint = {point = []} ;

-}
+}
--- a/lib/resource-1.0/multimodal/old/DemRes.gf
+++ b/lib/resource-1.0/multimodal/old/DemRes.gf
--- a/lib/resource-1.0/multimodal/old/Demonstrative.gf
+++ b/lib/resource-1.0/multimodal/old/Demonstrative.gf
--- a/lib/resource-1.0/multimodal/old/DemonstrativeEng.gf
+++ b/lib/resource-1.0/multimodal/old/DemonstrativeEng.gf
--- a/lib/resource-1.0/multimodal/old/DemonstrativeFin.gf
+++ b/lib/resource-1.0/multimodal/old/DemonstrativeFin.gf
--- a/lib/resource-1.0/multimodal/old/DemonstrativeFre.gf
+++ b/lib/resource-1.0/multimodal/old/DemonstrativeFre.gf
--- a/lib/resource-1.0/multimodal/old/DemonstrativeGer.gf
+++ b/lib/resource-1.0/multimodal/old/DemonstrativeGer.gf
--- a/lib/resource-1.0/multimodal/old/DemonstrativeI.gf
+++ b/lib/resource-1.0/multimodal/old/DemonstrativeI.gf
--- a/lib/resource-1.0/multimodal/old/DemonstrativeIta.gf
+++ b/lib/resource-1.0/multimodal/old/DemonstrativeIta.gf
--- a/lib/resource-1.0/multimodal/old/DemonstrativeNor.gf
+++ b/lib/resource-1.0/multimodal/old/DemonstrativeNor.gf
--- a/lib/resource-1.0/multimodal/old/DemonstrativeSpa.gf
+++ b/lib/resource-1.0/multimodal/old/DemonstrativeSpa.gf
--- a/lib/resource-1.0/multimodal/old/DemonstrativeSwe.gf
+++ b/lib/resource-1.0/multimodal/old/DemonstrativeSwe.gf
--- a/lib/resource-1.0/multimodal/old/Multimodal.gf
+++ b/lib/resource-1.0/multimodal/old/Multimodal.gf
--- a/lib/resource-1.0/multimodal/old/MultimodalEng.gf
+++ b/lib/resource-1.0/multimodal/old/MultimodalEng.gf
--- a/lib/resource-1.0/multimodal/old/MultimodalFin.gf
+++ b/lib/resource-1.0/multimodal/old/MultimodalFin.gf
--- a/lib/resource-1.0/multimodal/old/MultimodalFre.gf
+++ b/lib/resource-1.0/multimodal/old/MultimodalFre.gf
--- a/lib/resource-1.0/multimodal/old/MultimodalGer.gf
+++ b/lib/resource-1.0/multimodal/old/MultimodalGer.gf
--- a/lib/resource-1.0/multimodal/old/MultimodalIta.gf
+++ b/lib/resource-1.0/multimodal/old/MultimodalIta.gf
--- a/lib/resource-1.0/multimodal/old/MultimodalNor.gf
+++ b/lib/resource-1.0/multimodal/old/MultimodalNor.gf
--- a/lib/resource-1.0/multimodal/old/MultimodalSpa.gf
+++ b/lib/resource-1.0/multimodal/old/MultimodalSpa.gf
--- a/lib/resource-1.0/multimodal/old/MultimodalSwe.gf
+++ b/lib/resource-1.0/multimodal/old/MultimodalSwe.gf