diff --git a/lib/resource-1.0/Makefile b/lib/resource-1.0/Makefile
index 861b3afcc..7daa44921 100644
--- a/lib/resource-1.0/Makefile
+++ b/lib/resource-1.0/Makefile
@@ -1,7 +1,7 @@
 all: langs test
 
 test:
-	echo "gr -cat=S -number=11 -prob | tb" | gf -nocf -probs=lang.gfprob langs.gfcm
+	echo "gr -cat=Text -number=11 -prob | tb" | gf -nocf -probs=lang.gfprob langs.gfcm
 langs:
 	echo "s ;; pm | wf langs.gfcm" | gf -src -nocf */Lang??*.gf english/LangEng.gf +RTS -M500M
 
diff --git a/lib/resource-1.0/doc/German.dot b/lib/resource-1.0/doc/German.dot
index 2927af446..e17ca1484 100644
--- a/lib/resource-1.0/doc/German.dot
+++ b/lib/resource-1.0/doc/German.dot
@@ -73,19 +73,19 @@ ParadigmsGer -> MorphoGer [style = "dotted"];
 ParadigmsGer -> CatGer [style = "dotted"];
 
 CatGer [style = "dashed", shape = "box", URL = "CatGer.gf"];
-CatGer -> TenseX [style = "solid"];
+CatGer -> CommonX [style = "solid"];
 CatGer -> ResGer [style = "dotted"];
 CatGer -> Prelude [style = "dotted"];
 CatGer -> Cat [arrowhead = "empty", style = "dashed"];
 
 Cat [style = "solid", shape = "ellipse", URL = "Cat.gf"];
-Cat -> Tense [style = "solid"];
+Cat -> Common [style = "solid"];
 
-TenseX [style = "dashed", shape = "box", URL = "TenseX.gf"];
-TenseX -> ParamX [style = "dotted"];
-TenseX -> Tense [arrowhead = "empty", style = "dashed"];
+CommonX [style = "dashed", shape = "box", URL = "CommonX.gf"];
+CommonX -> ParamX [style = "dotted"];
+CommonX -> Common [arrowhead = "empty", style = "dashed"];
 
-Tense [style = "solid", shape = "ellipse", URL = "Tense.gf"];
+Common [style = "solid", shape = "ellipse", URL = "Common.gf"];
 
 MorphoGer [style = "dashed", shape = "ellipse", URL = "MorphoGer.gf"];
 MorphoGer -> ResGer [style = "solid"];
@@ -93,12 +93,9 @@ MorphoGer -> Prelude [style = "dotted"];
 MorphoGer -> Predef [style = "dotted"];
 
 ResGer [style = "dashed", shape = "ellipse", URL = "ResGer.gf"];
-ResGer -> ParamGer [style = "solid"];
+ResGer -> ParamX [style = "solid"];
 ResGer -> Prelude [style = "dotted"];
 
-ParamGer [style = "dashed", shape = "ellipse", URL = "ParamGer.gf"];
-ParamGer -> ParamX [style = "solid"];
-
 ParamX [style = "dashed", shape = "ellipse", URL = "ParamX.gf"];
 ParamX -> Prelude [style = "dotted"];
 
diff --git a/lib/resource-1.0/doc/German.png b/lib/resource-1.0/doc/German.png
index df3c71c86..7c6303897 100644
Binary files a/lib/resource-1.0/doc/German.png and b/lib/resource-1.0/doc/German.png differ
diff --git a/lib/resource-1.0/doc/Lang.dot b/lib/resource-1.0/doc/Lang.dot
index ec1fa508a..7de26e74c 100644
--- a/lib/resource-1.0/doc/Lang.dot
+++ b/lib/resource-1.0/doc/Lang.dot
@@ -13,6 +13,8 @@ Lang -> Question [style = "solid"];
 Lang -> Relative [style = "solid"];
 Lang -> Conjunction [style = "solid"];
 Lang -> Phrase [style = "solid"];
+Lang -> Text [style = "solid"];
+Lang -> Idiom [style = "solid"];
 Lang -> Structural [style = "solid"];
 Lang -> Lexicon [style = "solid"];
 
@@ -46,6 +48,12 @@ Conjunction -> Cat [style = "solid"];
 Phrase [style = "solid", shape = "ellipse", URL = "Phrase.gf"];
 Phrase -> Cat [style = "solid"];
 
+Text [style = "solid", shape = "ellipse", URL = "Phrase.gf"];
+Text -> Cat [style = "solid"];
+
+Idiom [style = "solid", shape = "ellipse", URL = "Phrase.gf"];
+Idiom -> Cat [style = "solid"];
+
 Structural [style = "solid", shape = "ellipse", URL = "Structural.gf"];
 Structural -> Cat [style = "solid"];
 
@@ -53,8 +61,8 @@ Lexicon [style = "solid", shape = "ellipse", URL = "Lexicon.gf"];
 Lexicon -> Cat [style = "solid"];
 
 Cat [style = "solid", shape = "ellipse", URL = "Cat.gf"];
-Cat -> Tense [style = "solid"];
+Cat -> Common [style = "solid"];
 
-Tense [style = "solid", shape = "ellipse", URL = "Tense.gf"];
+Common [style = "solid", shape = "ellipse", URL = "Tense.gf"];
 
 }
diff --git a/lib/resource-1.0/doc/Lang.png b/lib/resource-1.0/doc/Lang.png
index 4010ed9c9..3fc770382 100644
Binary files a/lib/resource-1.0/doc/Lang.png and b/lib/resource-1.0/doc/Lang.png differ
diff --git a/lib/resource-1.0/doc/Resource-HOWTO.html b/lib/resource-1.0/doc/Resource-HOWTO.html
index 92a5b7c8c..1b77a9191 100644
--- a/lib/resource-1.0/doc/Resource-HOWTO.html
+++ b/lib/resource-1.0/doc/Resource-HOWTO.html
@@ -7,7 +7,7 @@
 <P ALIGN="center"><CENTER><H1>Resource grammar writing HOWTO</H1>
 <FONT SIZE="4">
 <I>Author: Aarne Ranta &lt;aarne (at) cs.chalmers.se&gt;</I><BR>
-Last update: Tue Feb  7 09:22:12 2006
+Last update: Tue Feb 21 16:34:52 2006
 </FONT></CENTER>
 
 <P></P>
@@ -101,6 +101,8 @@ one of a small number of different types). Thus we have
 <LI><CODE>Relative</CODE>: construction of relative clauses
 <LI><CODE>Conjunction</CODE>: coordination of phrases
 <LI><CODE>Phrase</CODE>: construction of the major units of text and speech
+<LI><CODE>Text</CODE>: construction of texts as sequences of phrases
+<LI><CODE>Idiom</CODE>: idiomatic phrases such as existentials
 </UL>
 
 <A NAME="toc3"></A>
@@ -346,8 +348,8 @@ package.
 </P>
 <UL>
 <LI><CODE>ParamX</CODE>: parameter types used in many languages
-<LI><CODE>TenseX</CODE>: implementation of the logical tense, anteriority, 
-     and polarity parameters
+<LI><CODE>CommonX</CODE>: implementation of the categories $Text$ and $Phr$, as well as of
+     the logical tense, anteriority, and polarity parameters
 <LI><CODE>Coordination</CODE>: operations to deal with lists and coordination
 <LI><CODE>Prelude</CODE>: general-purpose operations on strings, records,
       truth values, etc.
@@ -566,13 +568,13 @@ are only found in the comments of the modules.
 <A NAME="toc15"></A>
 <H3>The category system</H3>
 <UL>
+<LI><A HREF="gfdoc/Common.html">Common</A>, <A HREF="../common/CommonX.gf">CommonX</A>
 <LI><A HREF="gfdoc/Cat.html">Cat</A>, <A HREF="gfdoc/CatGer.gf">CatGer</A>
 </UL>
 
 <A NAME="toc16"></A>
 <H3>Phrase category modules</H3>
 <UL>
-<LI><A HREF="gfdoc/Tense.html">Tense</A>, <A HREF="../german/TenseGer.gf">TenseGer</A>
 <LI><A HREF="gfdoc/Noun.html">Noun</A>, <A HREF="../german/NounGer.gf">NounGer</A>
 <LI><A HREF="gfdoc/Adjective.html">Adjective</A>, <A HREF="../german/AdjectiveGer.gf">AdjectiveGer</A>
 <LI><A HREF="gfdoc/Verb.html">Verb</A>, <A HREF="../german/VerbGer.gf">VerbGer</A>
@@ -583,6 +585,8 @@ are only found in the comments of the modules.
 <LI><A HREF="gfdoc/Relative.html">Relative</A>, <A HREF="../german/RelativeGer.gf">RelativeGer</A>
 <LI><A HREF="gfdoc/Conjunction.html">Conjunction</A>, <A HREF="../german/ConjunctionGer.gf">ConjunctionGer</A>
 <LI><A HREF="gfdoc/Phrase.html">Phrase</A>, <A HREF="../german/PhraseGer.gf">PhraseGer</A>
+<LI><A HREF="gfdoc/Text.html">Text</A>, <A HREF="../common/TextX.gf">TextX</A>
+<LI><A HREF="gfdoc/Idiom.html">Idiom</A>, <A HREF="../german/IdiomGer.gf">IdiomGer</A>
 <LI><A HREF="gfdoc/Lang.html">Lang</A>, <A HREF="../german/LangGer.gf">LangGer</A>
 </UL>
 
diff --git a/lib/resource-1.0/doc/Resource-HOWTO.txt b/lib/resource-1.0/doc/Resource-HOWTO.txt
index 28e11d632..6a176651e 100644
--- a/lib/resource-1.0/doc/Resource-HOWTO.txt
+++ b/lib/resource-1.0/doc/Resource-HOWTO.txt
@@ -56,6 +56,8 @@ one of a small number of different types). Thus we have
 - ``Relative``: construction of relative clauses
 - ``Conjunction``: coordination of phrases
 - ``Phrase``: construction of the major units of text and speech
+- ``Text``: construction of texts as sequences of phrases
+- ``Idiom``: idiomatic phrases such as existentials
 
 
 
@@ -289,8 +291,8 @@ These modules are language-independent and provided by the existing resource
 package.
 
 - ``ParamX``: parameter types used in many languages
-- ``TenseX``: implementation of the logical tense, anteriority, 
-     and polarity parameters
+- ``CommonX``: implementation of the categories $Text$ and $Phr$, as well as of
+     the logical tense, anteriority, and polarity parameters
 - ``Coordination``: operations to deal with lists and coordination
 - ``Prelude``: general-purpose operations on strings, records,
       truth values, etc.
@@ -489,12 +491,12 @@ are only found in the comments of the modules.
 
 ===The category system===
 
+- [Common gfdoc/Common.html], [CommonX ../common/CommonX.gf]
 - [Cat gfdoc/Cat.html], [CatGer gfdoc/CatGer.gf]
 
 
 ===Phrase category modules===
 
-- [Tense gfdoc/Tense.html], [TenseGer ../german/TenseGer.gf]
 - [Noun gfdoc/Noun.html], [NounGer ../german/NounGer.gf]
 - [Adjective gfdoc/Adjective.html], [AdjectiveGer ../german/AdjectiveGer.gf]
 - [Verb gfdoc/Verb.html], [VerbGer ../german/VerbGer.gf]
@@ -505,6 +507,8 @@ are only found in the comments of the modules.
 - [Relative gfdoc/Relative.html], [RelativeGer ../german/RelativeGer.gf]
 - [Conjunction gfdoc/Conjunction.html], [ConjunctionGer ../german/ConjunctionGer.gf]
 - [Phrase gfdoc/Phrase.html], [PhraseGer ../german/PhraseGer.gf]
+- [Text gfdoc/Text.html], [TextX ../common/TextX.gf]
+- [Idiom gfdoc/Idiom.html], [IdiomGer ../german/IdiomGer.gf]
 - [Lang gfdoc/Lang.html], [LangGer ../german/LangGer.gf]
 
 
diff --git a/lib/resource-1.0/doc/gfdoc/Adjective.html b/lib/resource-1.0/doc/gfdoc/Adjective.html
index 5e1b3aa6f..df84b9bc0 100644
--- a/lib/resource-1.0/doc/gfdoc/Adjective.html
+++ b/lib/resource-1.0/doc/gfdoc/Adjective.html
@@ -7,7 +7,7 @@
 <P ALIGN="center"><CENTER><H1> Adjectives and adjectival phrases</H1>
 <FONT SIZE="4">
 <I>Author: </I><BR>
-Last update: Tue Feb  7 19:04:48 2006
+Last update: Tue Feb 21 16:23:51 2006
 </FONT></CENTER>
 
 <P></P>
diff --git a/lib/resource-1.0/doc/gfdoc/Adverb.html b/lib/resource-1.0/doc/gfdoc/Adverb.html
index 6b4c3b7a9..bc988a462 100644
--- a/lib/resource-1.0/doc/gfdoc/Adverb.html
+++ b/lib/resource-1.0/doc/gfdoc/Adverb.html
@@ -7,7 +7,7 @@
 <P ALIGN="center"><CENTER><H1> Adverbs and adverbial phrases</H1>
 <FONT SIZE="4">
 <I>Author: </I><BR>
-Last update: Tue Feb  7 19:04:48 2006
+Last update: Tue Feb 21 16:23:52 2006
 </FONT></CENTER>
 
 <P></P>
diff --git a/lib/resource-1.0/doc/gfdoc/Cat.html b/lib/resource-1.0/doc/gfdoc/Cat.html
index ea2d10b2e..b4427a1e6 100644
--- a/lib/resource-1.0/doc/gfdoc/Cat.html
+++ b/lib/resource-1.0/doc/gfdoc/Cat.html
@@ -7,7 +7,7 @@
 <P ALIGN="center"><CENTER><H1> The category system</H1>
 <FONT SIZE="4">
 <I>Author: </I><BR>
-Last update: Tue Feb  7 19:04:49 2006
+Last update: Tue Feb 21 16:23:52 2006
 </FONT></CENTER>
 
 <P></P>
@@ -40,8 +40,11 @@ gfdoc - a rudimentary GF document generator.
 </P>
 <A NAME="toc1"></A>
 <H1>The category system</H1>
+<P>
+Some categories are inherited from <A HREF="Common.html">Common</A>.
+</P>
 <PRE>
-    abstract Cat = Tense ** {
+    abstract Cat = Common ** {
     
       cat
 </PRE>
@@ -49,11 +52,10 @@ gfdoc - a rudimentary GF document generator.
 <A NAME="toc2"></A>
 <H2>Top-level units</H2>
 <P>
-Constructed in <A HREF="Phrase.html">Phrase</A>.
+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>
-        Text ;  -- text consisting of several phrases
-        Phr ;   -- phrase in a text                    e.g. "But be quiet my darling."
         Utt ;   -- sentence, question, word...         e.g. "be quiet"
         Voc ;   -- vocative or "please"                e.g. "my darling"
 </PRE>
@@ -61,7 +63,8 @@ Constructed in <A HREF="Phrase.html">Phrase</A>.
 <A NAME="toc3"></A>
 <H2>Sentences and clauses</H2>
 <P>
-Constructed in <A HREF="Sentence.html">Sentence</A>.
+Constructed in <A HREF="Sentence.html">Sentence</A>, and also in
+<A HREF="Idiom.html">Idiom</A>.
 </P>
 <PRE>
         S ;     -- declarative sentence                e.g. "she lived here"
diff --git a/lib/resource-1.0/doc/gfdoc/Common.html b/lib/resource-1.0/doc/gfdoc/Common.html
new file mode 100644
index 000000000..d4cbfe679
--- /dev/null
+++ b/lib/resource-1.0/doc/gfdoc/Common.html
@@ -0,0 +1,60 @@
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
+<HTML>
+<HEAD>
+<META NAME="generator" CONTENT="http://txt2tags.sf.net">
+<TITLE> Infrastructure with common implementations.</TITLE>
+</HEAD><BODY BGCOLOR="white" TEXT="black">
+<P ALIGN="center"><CENTER><H1> Infrastructure with common implementations.</H1>
+<FONT SIZE="4">
+<I>Author: </I><BR>
+Last update: Tue Feb 21 16:23:52 2006
+</FONT></CENTER>
+
+<P></P>
+<HR NOSHADE SIZE=1>
+<P></P>
+  <UL>
+  <LI><A HREF="#toc1">Infrastructure with common implementations.</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>Infrastructure with common implementations.</H1>
+<P>
+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
+can be defined in the language extensions, e.g. the <I>passé simple</I> of
+Romance languages.
+</P>
+<PRE>
+    abstract Common = {
+    
+      cat
+        Text ;   -- text consisting of several phrases
+        Phr ;    -- phrase in a text                    e.g. "But be quiet my darling."
+    
+        Pol ;
+        Tense ;
+        Ant ;
+    
+      fun
+        PPos, PNeg : Pol ;                  -- I sleep/don't sleep
+        TPres, TPast, TFut, TCond : Tense ; -- I sleep/slept/will sleep/would sleep
+        ASimul, AAnter : Ant ;              -- I sleep/have slept
+    
+    }
+</PRE>
+<P></P>
+
+<!-- html code generated by txt2tags 2.0 (http://txt2tags.sf.net) -->
+<!-- cmdline: txt2tags -thtml -\-toc abstract/Common.txt -->
+</BODY></HTML>
diff --git a/lib/resource-1.0/doc/gfdoc/Conjunction.html b/lib/resource-1.0/doc/gfdoc/Conjunction.html
index 26709d54e..6f8abd9f0 100644
--- a/lib/resource-1.0/doc/gfdoc/Conjunction.html
+++ b/lib/resource-1.0/doc/gfdoc/Conjunction.html
@@ -7,7 +7,7 @@
 <P ALIGN="center"><CENTER><H1> Coordination</H1>
 <FONT SIZE="4">
 <I>Author: </I><BR>
-Last update: Tue Feb  7 19:04:49 2006
+Last update: Tue Feb 21 16:23:52 2006
 </FONT></CENTER>
 
 <P></P>
diff --git a/lib/resource-1.0/doc/gfdoc/Demonstrative.html b/lib/resource-1.0/doc/gfdoc/Demonstrative.html
index 4f83d397a..0191ab138 100644
--- a/lib/resource-1.0/doc/gfdoc/Demonstrative.html
+++ b/lib/resource-1.0/doc/gfdoc/Demonstrative.html
@@ -14,7 +14,7 @@
 <P></P>
 <P>
 Author: 
-Last update: Tue Feb  7 19:04:53 2006
+Last update: Tue Feb 21 16:23:56 2006
 </P>
 <P>
 Produced by 
diff --git a/lib/resource-1.0/doc/gfdoc/Idiom.html b/lib/resource-1.0/doc/gfdoc/Idiom.html
new file mode 100644
index 000000000..e06b24bee
--- /dev/null
+++ b/lib/resource-1.0/doc/gfdoc/Idiom.html
@@ -0,0 +1,52 @@
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
+<HTML>
+<HEAD>
+<META NAME="generator" CONTENT="http://txt2tags.sf.net">
+<TITLE> Idiomatic expressions</TITLE>
+</HEAD><BODY BGCOLOR="white" TEXT="black">
+<P ALIGN="center"><CENTER><H1> Idiomatic expressions</H1>
+<FONT SIZE="4">
+<I>Author: </I><BR>
+Last update: Tue Feb 21 16:23:52 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>
+<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>Idiomatic expressions</H1>
+<PRE>
+    abstract Idiom = Cat ** {
+</PRE>
+<P></P>
+<P>
+This module defines constructions that are formed in fixed ways,
+often different even in closely related languages.
+</P>
+<PRE>
+      fun
+        ExistNP   : NP -&gt; Cl ;    -- there is a house
+        ImpersCl  : VP -&gt; Cl ;    -- it rains
+        GenericCl : VP -&gt; Cl ;    -- one sleeps
+    
+        ProgrVP   : VP -&gt; VP ;    -- sleeping
+    
+    }
+</PRE>
+<P></P>
+
+<!-- html code generated by txt2tags 2.0 (http://txt2tags.sf.net) -->
+<!-- cmdline: txt2tags -thtml -\-toc abstract/Idiom.txt -->
+</BODY></HTML>
diff --git a/lib/resource-1.0/doc/gfdoc/IrregFre.gf b/lib/resource-1.0/doc/gfdoc/IrregFre.gf
index f4d9cb042..748cb4361 100644
--- a/lib/resource-1.0/doc/gfdoc/IrregFre.gf
+++ b/lib/resource-1.0/doc/gfdoc/IrregFre.gf
@@ -24,7 +24,7 @@ lin
   admettre_V2 = v_besch56 "admettre" ** {vtyp = VHabere ; lock_V2 = <> ; c2 = complAcc} ;
   advenir_V = v_besch23 "advenir" ** {vtyp = VEsse ; lock_V = <>} ;
   aller_V = v_besch22 "aller" ** {vtyp = VEsse ; lock_V = <>} ;
-  apercevoir_V2 = v_besch38 "apercevoir" ** {vtyp = VHabere ; lock_V2 = <> ; c2 = complGen} ;
+  apercevoir_V2 = v_besch38 "apercevoir" ** {vtyp = VRefl ; lock_V2 = <> ; c2 = complGen} ;
   apparaître_V = v_besch64 "apparaître" ** {vtyp = VHabere ; lock_V = <>} ;
   appartenir_V2 = v_besch23 "appartenir" ** {vtyp = VHabere ; lock_V2 = <> ; c2 = complDat} ;
   appendre_V2 = v_besch53 "appendre" ** {vtyp = VHabere ; lock_V2 = <> ; c2 = complAcc} ;
diff --git a/lib/resource-1.0/doc/gfdoc/Lang.html b/lib/resource-1.0/doc/gfdoc/Lang.html
index 4c81cec31..db99ade40 100644
--- a/lib/resource-1.0/doc/gfdoc/Lang.html
+++ b/lib/resource-1.0/doc/gfdoc/Lang.html
@@ -7,7 +7,7 @@
 <P ALIGN="center"><CENTER><H1> The Main Module of the Resource Grammar</H1>
 <FONT SIZE="4">
 <I>Author: </I><BR>
-Last update: Tue Feb  7 19:04:49 2006
+Last update: Tue Feb 21 16:23:53 2006
 </FONT></CENTER>
 
 <P></P>
@@ -44,7 +44,9 @@ grammar. A smaller top module is <A HREF="Test.html">Test</A>.
       Relative,
       Conjunction,
       Phrase,
+      Text,
       Structural,
+      Idiom,
       Lexicon
       ** {} ;
 </PRE>
diff --git a/lib/resource-1.0/doc/gfdoc/Mathematical.html b/lib/resource-1.0/doc/gfdoc/Mathematical.html
index e018465dd..154d0ecd9 100644
--- a/lib/resource-1.0/doc/gfdoc/Mathematical.html
+++ b/lib/resource-1.0/doc/gfdoc/Mathematical.html
@@ -7,7 +7,7 @@
 <P ALIGN="center"><CENTER><H1> The Mathematics API to the Resource Grammar</H1>
 <FONT SIZE="4">
 <I>Author: </I><BR>
-Last update: Tue Feb  7 19:04:53 2006
+Last update: Tue Feb 21 16:23:56 2006
 </FONT></CENTER>
 
 <P></P>
diff --git a/lib/resource-1.0/doc/gfdoc/Multimodal.html b/lib/resource-1.0/doc/gfdoc/Multimodal.html
index a8890de6f..59b903185 100644
--- a/lib/resource-1.0/doc/gfdoc/Multimodal.html
+++ b/lib/resource-1.0/doc/gfdoc/Multimodal.html
@@ -14,7 +14,7 @@
 <P></P>
 <P>
 Author: 
-Last update: Tue Feb  7 19:04:53 2006
+Last update: Tue Feb 21 16:23:56 2006
 </P>
 <P>
 Produced by 
diff --git a/lib/resource-1.0/doc/gfdoc/Noun.html b/lib/resource-1.0/doc/gfdoc/Noun.html
index 77bf1aa6f..32290145c 100644
--- a/lib/resource-1.0/doc/gfdoc/Noun.html
+++ b/lib/resource-1.0/doc/gfdoc/Noun.html
@@ -7,7 +7,7 @@
 <P ALIGN="center"><CENTER><H1> The construction of nouns, noun phrases, and determiners</H1>
 <FONT SIZE="4">
 <I>Author: </I><BR>
-Last update: Tue Feb  7 19:04:50 2006
+Last update: Tue Feb 21 16:23:53 2006
 </FONT></CENTER>
 
 <P></P>
@@ -59,7 +59,7 @@ Pronouns are defined in the module <A HREF="Structural.html">Structural</A>.
 A noun phrase already formed can be modified by a Predeterminer.
 </P>
 <PRE>
-       PredetNP : Predet -&gt; NP -&gt; NP; -- only the man 
+        PredetNP : Predet -&gt; NP -&gt; NP; -- only the man 
 </PRE>
 <P></P>
 <A NAME="toc3"></A>
diff --git a/lib/resource-1.0/doc/gfdoc/Numeral.html b/lib/resource-1.0/doc/gfdoc/Numeral.html
index 2cfffa8e6..0677803f6 100644
--- a/lib/resource-1.0/doc/gfdoc/Numeral.html
+++ b/lib/resource-1.0/doc/gfdoc/Numeral.html
@@ -7,7 +7,7 @@
 <P ALIGN="center"><CENTER><H1> Numerals</H1>
 <FONT SIZE="4">
 <I>Author: </I><BR>
-Last update: Tue Feb  7 19:04:50 2006
+Last update: Tue Feb 21 16:23:53 2006
 </FONT></CENTER>
 
 <P></P>
diff --git a/lib/resource-1.0/doc/gfdoc/ParadigmsEng.html b/lib/resource-1.0/doc/gfdoc/ParadigmsEng.html
index 89c0eda59..926a8830a 100644
--- a/lib/resource-1.0/doc/gfdoc/ParadigmsEng.html
+++ b/lib/resource-1.0/doc/gfdoc/ParadigmsEng.html
@@ -43,7 +43,7 @@
 <P></P>
 <P>
 Author: 
-Last update: Tue Feb  7 19:04:51 2006
+Last update: Tue Feb 21 16:23:54 2006
 </P>
 <P>
 Produced by 
@@ -54,7 +54,7 @@ gfdoc - a rudimentary GF document generator.
 ==
 </P>
 <P>
-# -path=.:../abstract:../../prelude
+# -path=.:../abstract:../../prelude:../common
 </P>
 <A NAME="toc1"></A>
 <H1>English Lexical Paradigms</H1>
@@ -109,7 +109,6 @@ To abstract over gender names, we define the following identifiers.
       human     : Gender ;
       nonhuman  : Gender ;
       masculine : Gender ;
-      feminite  : Gender ;
 </PRE>
 <P></P>
 <P>
diff --git a/lib/resource-1.0/doc/gfdoc/ParadigmsFin.html b/lib/resource-1.0/doc/gfdoc/ParadigmsFin.html
index 3af26d9b5..0a3d72c29 100644
--- a/lib/resource-1.0/doc/gfdoc/ParadigmsFin.html
+++ b/lib/resource-1.0/doc/gfdoc/ParadigmsFin.html
@@ -28,7 +28,7 @@
 <P></P>
 <P>
 Author: 
-Last update: Tue Feb  7 19:04:51 2006
+Last update: Tue Feb 21 16:23:55 2006
 </P>
 <P>
 Produced by 
@@ -190,14 +190,6 @@ Examples: <I>talo</I>, <I>kukko</I>, <I>huippu</I>, <I>koira</I>, <I>kukka</I>,
 </PRE>
 <P></P>
 <P>
-For convenience, we define 1-argument paradigms as producing the
-nonhuman gender; the following function changes this:
-</P>
-<PRE>
-      humanN : N -&gt; N ;
-</PRE>
-<P></P>
-<P>
 A special case are nouns with no alternations: 
 the vowel harmony is inferred from the last letter,
 which must be one of <I>o</I>, <I>u</I>, <I>ö</I>, <I>y</I>.
diff --git a/lib/resource-1.0/doc/gfdoc/ParadigmsFre.html b/lib/resource-1.0/doc/gfdoc/ParadigmsFre.html
index bd788334a..daebfdf4f 100644
--- a/lib/resource-1.0/doc/gfdoc/ParadigmsFre.html
+++ b/lib/resource-1.0/doc/gfdoc/ParadigmsFre.html
@@ -41,7 +41,7 @@
 <P></P>
 <P>
 Author: 
-Last update: Tue Feb  7 19:04:52 2006
+Last update: Tue Feb 21 16:23:55 2006
 </P>
 <P>
 Produced by 
@@ -276,13 +276,6 @@ the following pattern is used:
 </PRE>
 <P></P>
 <P>
-From a given <CODE>A</CODE>, it is possible to get back to <CODE>A</CODE>.
-</P>
-<PRE>
-      adegA : A -&gt; A ;
-</PRE>
-<P></P>
-<P>
 For prefixed adjectives, the following function is
 provided.
 </P>
@@ -397,25 +390,24 @@ questions, verb phrases, and adjectives.
       aVV   : V -&gt; VV ;  -- "j'arrive à parler"
       mkV2V : V -&gt; Preposition -&gt; Preposition -&gt; V2V ;
       mkVA  : V -&gt; VA ;
-      mkV2A : V -&gt; Preposition -&gt; V2A ;
+      mkV2A : V -&gt; Preposition -&gt; Preposition -&gt; V2A ;
       mkVQ  : V -&gt; VQ ;
       mkV2Q : V -&gt; Preposition -&gt; V2Q ;
     
-      mkAS   : A -&gt; AS ;
-      subjAS : A -&gt; AS ;
+      mkAS  : A -&gt; AS ;
       mkA2S : A -&gt; Preposition -&gt; A2S ;
       mkAV  : A -&gt; Preposition -&gt; AV ;
       mkA2V : A -&gt; Preposition -&gt; Preposition -&gt; A2V ;
 </PRE>
 <P></P>
 <P>
-Notice: categories <CODE>V2S, V2V, V2A, V2Q</CODE> are in v 1.0 treated
+Notice: categories <CODE>V2S, V2V, V2Q</CODE> are in v 1.0 treated
 just as synonyms of <CODE>V2</CODE>, and the second argument is given
 as an adverb. Likewise <CODE>AS, A2S, AV, A2V</CODE> are just <CODE>A</CODE>.
 <CODE>V0</CODE> is just <CODE>V</CODE>.
 </P>
 <PRE>
-      V0, V2S, V2V, V2A, V2Q : Type ;
+      V0, V2S, V2V, V2Q : Type ;
       AS, A2S, AV, A2V : Type ;
 </PRE>
 <P></P>
diff --git a/lib/resource-1.0/doc/gfdoc/ParadigmsGer.html b/lib/resource-1.0/doc/gfdoc/ParadigmsGer.html
index 39fc6b7f0..badbb7e36 100644
--- a/lib/resource-1.0/doc/gfdoc/ParadigmsGer.html
+++ b/lib/resource-1.0/doc/gfdoc/ParadigmsGer.html
@@ -35,7 +35,7 @@
 <P></P>
 <P>
 Author: 
-Last update: Tue Feb  7 19:04:52 2006
+Last update: Tue Feb 21 16:23:55 2006
 </P>
 <P>
 Produced by 
diff --git a/lib/resource-1.0/doc/gfdoc/ParadigmsIta.html b/lib/resource-1.0/doc/gfdoc/ParadigmsIta.html
index a3295f030..a4503dc3c 100644
--- a/lib/resource-1.0/doc/gfdoc/ParadigmsIta.html
+++ b/lib/resource-1.0/doc/gfdoc/ParadigmsIta.html
@@ -41,7 +41,7 @@
 <P></P>
 <P>
 Author: 
-Last update: Tue Feb  7 19:04:52 2006
+Last update: Tue Feb 21 16:23:55 2006
 </P>
 <P>
 Produced by 
@@ -389,25 +389,24 @@ questions, verb phrases, and adjectives.
       aVV   : V -&gt; VV ;  -- "j'arrive à parler"
       mkV2V : V -&gt; Preposition -&gt; Preposition -&gt; V2V ;
       mkVA  : V -&gt; VA ;
-      mkV2A : V -&gt; Preposition -&gt; V2A ;
+      mkV2A : V -&gt; Preposition -&gt; Preposition -&gt; V2A ;
       mkVQ  : V -&gt; VQ ;
       mkV2Q : V -&gt; Preposition -&gt; V2Q ;
     
-      mkAS   : A -&gt; AS ;
-      subjAS : A -&gt; AS ;
+      mkAS  : A -&gt; AS ;
       mkA2S : A -&gt; Preposition -&gt; A2S ;
       mkAV  : A -&gt; Preposition -&gt; AV ;
       mkA2V : A -&gt; Preposition -&gt; Preposition -&gt; A2V ;
 </PRE>
 <P></P>
 <P>
-Notice: categories <CODE>V2S, V2V, V2A, V2Q</CODE> are in v 1.0 treated
+Notice: categories <CODE>V2S, V2V, V2Q</CODE> are in v 1.0 treated
 just as synonyms of <CODE>V2</CODE>, and the second argument is given
 as an adverb. Likewise <CODE>AS, A2S, AV, A2V</CODE> are just <CODE>A</CODE>.
 <CODE>V0</CODE> is just <CODE>V</CODE>.
 </P>
 <PRE>
-      V0, V2S, V2V, V2A, V2Q : Type ;
+      V0, V2S, V2V, V2Q : Type ;
       AS, A2S, AV, A2V : Type ;
 </PRE>
 <P></P>
diff --git a/lib/resource-1.0/doc/gfdoc/ParadigmsNor.html b/lib/resource-1.0/doc/gfdoc/ParadigmsNor.html
index 22b6b8240..d8adfc52b 100644
--- a/lib/resource-1.0/doc/gfdoc/ParadigmsNor.html
+++ b/lib/resource-1.0/doc/gfdoc/ParadigmsNor.html
@@ -43,7 +43,7 @@
 <P></P>
 <P>
 Author: 
-Last update: Tue Feb  7 19:04:52 2006
+Last update: Tue Feb 21 16:23:55 2006
 </P>
 <P>
 Produced by 
diff --git a/lib/resource-1.0/doc/gfdoc/ParadigmsSpa.html b/lib/resource-1.0/doc/gfdoc/ParadigmsSpa.html
index 76b8015b3..fcb1f3e89 100644
--- a/lib/resource-1.0/doc/gfdoc/ParadigmsSpa.html
+++ b/lib/resource-1.0/doc/gfdoc/ParadigmsSpa.html
@@ -41,7 +41,7 @@
 <P></P>
 <P>
 Author: 
-Last update: Tue Feb  7 19:04:52 2006
+Last update: Tue Feb 21 16:23:55 2006
 </P>
 <P>
 Produced by 
@@ -396,26 +396,25 @@ questions, verb phrases, and adjectives.
       aVV   : V -&gt; VV ;  -- "j'arrive à parler"
       mkV2V : V -&gt; Preposition -&gt; Preposition -&gt; V2V ;
       mkVA  : V -&gt; VA ;
-      mkV2A : V -&gt; Preposition -&gt; V2A ;
+      mkV2A : V -&gt; Preposition -&gt; Preposition -&gt; V2A ;
       mkVQ  : V -&gt; VQ ;
       mkV2Q : V -&gt; Preposition -&gt; V2Q ;
     
-      mkAS   : A -&gt; AS ;
-      subjAS : A -&gt; AS ;
+      mkAS  : A -&gt; AS ;
       mkA2S : A -&gt; Preposition -&gt; A2S ;
       mkAV  : A -&gt; Preposition -&gt; AV ;
       mkA2V : A -&gt; Preposition -&gt; Preposition -&gt; A2V ;
 </PRE>
 <P></P>
 <P>
-Notice: categories <CODE>V2S, V2V, V2A, V2Q</CODE> are in v 1.0 treated
+Notice: categories <CODE>V2S, V2V, V2Q</CODE> are in v 1.0 treated
 just as synonyms of <CODE>V2</CODE>, and the second argument is given
 as an adverb. Likewise <CODE>AS, A2S, AV, A2V</CODE> are just <CODE>A</CODE>.
 <CODE>V0</CODE> is just <CODE>V</CODE>.
 </P>
 <PRE>
-      V0, V2S, V2V, V2A, V2Q : Type ;
-      AS, A2S, AV, A2V : Type ;
+      V0, V2S, V2V, V2Q : Type ;
+      AS, A2S, AV, A2V  : Type ;
 </PRE>
 <P></P>
 <A NAME="toc16"></A>
diff --git a/lib/resource-1.0/doc/gfdoc/ParadigmsSwe.html b/lib/resource-1.0/doc/gfdoc/ParadigmsSwe.html
index b73be52a1..4d8d34ca4 100644
--- a/lib/resource-1.0/doc/gfdoc/ParadigmsSwe.html
+++ b/lib/resource-1.0/doc/gfdoc/ParadigmsSwe.html
@@ -43,7 +43,7 @@
 <P></P>
 <P>
 Author: 
-Last update: Tue Feb  7 19:04:52 2006
+Last update: Tue Feb 21 16:23:55 2006
 </P>
 <P>
 Produced by 
diff --git a/lib/resource-1.0/doc/gfdoc/Phrase.html b/lib/resource-1.0/doc/gfdoc/Phrase.html
index 8cb2731b0..a5a43935c 100644
--- a/lib/resource-1.0/doc/gfdoc/Phrase.html
+++ b/lib/resource-1.0/doc/gfdoc/Phrase.html
@@ -7,7 +7,7 @@
 <P ALIGN="center"><CENTER><H1> Phrases and utterances</H1>
 <FONT SIZE="4">
 <I>Author: </I><BR>
-Last update: Tue Feb  7 19:04:50 2006
+Last update: Tue Feb 21 16:23:53 2006
 </FONT></CENTER>
 
 <P></P>
diff --git a/lib/resource-1.0/doc/gfdoc/Predication.html b/lib/resource-1.0/doc/gfdoc/Predication.html
index 03a6e4e8f..ad208d90f 100644
--- a/lib/resource-1.0/doc/gfdoc/Predication.html
+++ b/lib/resource-1.0/doc/gfdoc/Predication.html
@@ -7,7 +7,7 @@
 <P ALIGN="center"><CENTER><H1> A Small Predication Library</H1>
 <FONT SIZE="4">
 <I>Author: </I><BR>
-Last update: Tue Feb  7 19:04:53 2006
+Last update: Tue Feb 21 16:23:56 2006
 </FONT></CENTER>
 
 <P></P>
diff --git a/lib/resource-1.0/doc/gfdoc/Question.html b/lib/resource-1.0/doc/gfdoc/Question.html
index 6ef994d05..8fe66fa78 100644
--- a/lib/resource-1.0/doc/gfdoc/Question.html
+++ b/lib/resource-1.0/doc/gfdoc/Question.html
@@ -7,7 +7,7 @@
 <P ALIGN="center"><CENTER><H1> Questions and interrogative pronouns</H1>
 <FONT SIZE="4">
 <I>Author: </I><BR>
-Last update: Tue Feb  7 19:04:50 2006
+Last update: Tue Feb 21 16:23:53 2006
 </FONT></CENTER>
 
 <P></P>
diff --git a/lib/resource-1.0/doc/gfdoc/Relative.html b/lib/resource-1.0/doc/gfdoc/Relative.html
index 92ca39433..841449a6b 100644
--- a/lib/resource-1.0/doc/gfdoc/Relative.html
+++ b/lib/resource-1.0/doc/gfdoc/Relative.html
@@ -7,7 +7,7 @@
 <P ALIGN="center"><CENTER><H1> Relative clauses and pronouns</H1>
 <FONT SIZE="4">
 <I>Author: </I><BR>
-Last update: Tue Feb  7 19:04:50 2006
+Last update: Tue Feb 21 16:23:53 2006
 </FONT></CENTER>
 
 <P></P>
diff --git a/lib/resource-1.0/doc/gfdoc/Sentence.html b/lib/resource-1.0/doc/gfdoc/Sentence.html
index c3f9beb7a..fe3c8ca6d 100644
--- a/lib/resource-1.0/doc/gfdoc/Sentence.html
+++ b/lib/resource-1.0/doc/gfdoc/Sentence.html
@@ -7,7 +7,7 @@
 <P ALIGN="center"><CENTER><H1> Sentences, clauses, imperatives, and sentential complements</H1>
 <FONT SIZE="4">
 <I>Author: </I><BR>
-Last update: Tue Feb  7 19:04:50 2006
+Last update: Tue Feb 21 16:23:54 2006
 </FONT></CENTER>
 
 <P></P>
diff --git a/lib/resource-1.0/doc/gfdoc/Structural.html b/lib/resource-1.0/doc/gfdoc/Structural.html
index b344945af..f87e9e4ba 100644
--- a/lib/resource-1.0/doc/gfdoc/Structural.html
+++ b/lib/resource-1.0/doc/gfdoc/Structural.html
@@ -7,7 +7,7 @@
 <P ALIGN="center"><CENTER><H1> GF Resource Grammar API for Structural Words</H1>
 <FONT SIZE="4">
 <I>Author: </I><BR>
-Last update: Tue Feb  7 19:04:51 2006
+Last update: Tue Feb 21 16:23:54 2006
 </FONT></CENTER>
 
 <P></P>
diff --git a/lib/resource-1.0/doc/gfdoc/Symbol.html b/lib/resource-1.0/doc/gfdoc/Symbol.html
index 37b4c5a85..7903f9236 100644
--- a/lib/resource-1.0/doc/gfdoc/Symbol.html
+++ b/lib/resource-1.0/doc/gfdoc/Symbol.html
@@ -7,7 +7,7 @@
 <P ALIGN="center"><CENTER><H1> Symbolic expressions</H1>
 <FONT SIZE="4">
 <I>Author: </I><BR>
-Last update: Tue Feb  7 19:04:53 2006
+Last update: Tue Feb 21 16:23:56 2006
 </FONT></CENTER>
 
 <P></P>
diff --git a/lib/resource-1.0/doc/gfdoc/Tense.html b/lib/resource-1.0/doc/gfdoc/Tense.html
index 5ad23f01d..79f170e2b 100644
--- a/lib/resource-1.0/doc/gfdoc/Tense.html
+++ b/lib/resource-1.0/doc/gfdoc/Tense.html
@@ -7,7 +7,7 @@
 <P ALIGN="center"><CENTER><H1> Tense, Polarity, and Anteriority</H1>
 <FONT SIZE="4">
 <I>Author: </I><BR>
-Last update: Tue Feb  7 19:04:51 2006
+Last update: Tue Feb 21 16:23:54 2006
 </FONT></CENTER>
 
 <P></P>
diff --git a/lib/resource-1.0/doc/gfdoc/Text.html b/lib/resource-1.0/doc/gfdoc/Text.html
new file mode 100644
index 000000000..0d28c3e6e
--- /dev/null
+++ b/lib/resource-1.0/doc/gfdoc/Text.html
@@ -0,0 +1,45 @@
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
+<HTML>
+<HEAD>
+<META NAME="generator" CONTENT="http://txt2tags.sf.net">
+<TITLE> Texts</TITLE>
+</HEAD><BODY BGCOLOR="white" TEXT="black">
+<P ALIGN="center"><CENTER><H1> Texts</H1>
+<FONT SIZE="4">
+<I>Author: </I><BR>
+Last update: Tue Feb 21 16:23:54 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>
+<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>Texts</H1>
+<PRE>
+    abstract Text = Cat ** {
+    
+      fun
+        TEmpty : Text ;
+        TFullStop : Phr -&gt; Text -&gt; Text ;
+        TQuestMark : Phr -&gt; Text -&gt; Text ;
+        TExclMark : Phr -&gt; Text -&gt; Text ;
+    
+    }
+</PRE>
+<P></P>
+
+<!-- html code generated by txt2tags 2.0 (http://txt2tags.sf.net) -->
+<!-- cmdline: txt2tags -thtml -\-toc abstract/Text.txt -->
+</BODY></HTML>
diff --git a/lib/resource-1.0/doc/gfdoc/Verb.html b/lib/resource-1.0/doc/gfdoc/Verb.html
index 119b1ffad..c1fd5b16b 100644
--- a/lib/resource-1.0/doc/gfdoc/Verb.html
+++ b/lib/resource-1.0/doc/gfdoc/Verb.html
@@ -7,7 +7,7 @@
 <P ALIGN="center"><CENTER><H1> The construction of verb phrases</H1>
 <FONT SIZE="4">
 <I>Author: </I><BR>
-Last update: Tue Feb  7 19:04:51 2006
+Last update: Tue Feb 21 16:23:54 2006
 </FONT></CENTER>
 
 <P></P>
diff --git a/lib/resource-1.0/doc/index.html b/lib/resource-1.0/doc/index.html
index 05331eef9..513397e85 100644
--- a/lib/resource-1.0/doc/index.html
+++ b/lib/resource-1.0/doc/index.html
@@ -7,7 +7,7 @@
 <P ALIGN="center"><CENTER><H1>GF Resource Grammar Library v. 1.0</H1>
 <FONT SIZE="4">
 <I>Author: Aarne Ranta &lt;aarne (at) cs.chalmers.se&gt;</I><BR>
-Last update: Tue Feb  7 19:05:12 2006
+Last update: Tue Feb 21 16:23:46 2006
 </FONT></CENTER>
 
 <P></P>
@@ -47,8 +47,8 @@ The following figure gives the dependencies of these modules.
 The documentation of the individual modules:
 </P>
 <UL>
+<LI><A HREF="gfdoc/Common.html">Common</A>: abstract notions with language-indep. implementations
 <LI><A HREF="gfdoc/Cat.html">Cat</A>: the category system
-<LI><A HREF="gfdoc/Tense.html">Tense</A>: tense, anteriority, and polarity values
 <LI><A HREF="gfdoc/Noun.html">Noun</A>: construction of nouns and noun phrases
 <LI><A HREF="gfdoc/Adjective.html">Adjective</A>: construction of adjectival phrases
 <LI><A HREF="gfdoc/Verb.html">Verb</A>: construction of verb phrases
@@ -59,6 +59,8 @@ The documentation of the individual modules:
 <LI><A HREF="gfdoc/Relative.html">Relative</A>: construction of relative clauses
 <LI><A HREF="gfdoc/Conjunction.html">Conjunction</A>: coordination of phrases
 <LI><A HREF="gfdoc/Phrase.html">Phrase</A>: construction of the major units of text and speech
+<LI><A HREF="gfdoc/Text.html">Text</A>: construction of texts from phrases, using punctuation
+<LI><A HREF="gfdoc/Idiom.html">Idiom</A>: idiomatic phrases, such as existentials
 <LI><A HREF="gfdoc/Structural.html">Structural</A>: a lexicon of structural words
 <LI><A HREF="gfdoc/Lexicon.html">Lexicon</A>: a lexicon of other common words, for test purposes
 <LI><A HREF="gfdoc/Lang.html">Lang</A>: the main module comprising all the others
diff --git a/lib/resource-1.0/doc/index.txt b/lib/resource-1.0/doc/index.txt
index a097e2322..8b7175aa6 100644
--- a/lib/resource-1.0/doc/index.txt
+++ b/lib/resource-1.0/doc/index.txt
@@ -27,8 +27,8 @@ The following figure gives the dependencies of these modules.
 
 The documentation of the individual modules:
 
+- [Common gfdoc/Common.html]: abstract notions with language-indep. implementations
 - [Cat gfdoc/Cat.html]: the category system
-- [Tense gfdoc/Tense.html]: tense, anteriority, and polarity values
 - [Noun gfdoc/Noun.html]: construction of nouns and noun phrases
 - [Adjective gfdoc/Adjective.html]: construction of adjectival phrases
 - [Verb gfdoc/Verb.html]: construction of verb phrases
@@ -39,6 +39,8 @@ The documentation of the individual modules:
 - [Relative gfdoc/Relative.html]: construction of relative clauses
 - [Conjunction gfdoc/Conjunction.html]: coordination of phrases
 - [Phrase gfdoc/Phrase.html]: construction of the major units of text and speech
+- [Text gfdoc/Text.html]: construction of texts from phrases, using punctuation
+- [Idiom gfdoc/Idiom.html]: idiomatic phrases, such as existentials
 - [Structural gfdoc/Structural.html]: a lexicon of structural words
 - [Lexicon gfdoc/Lexicon.html]: a lexicon of other common words, for test purposes
 - [Lang gfdoc/Lang.html]: the main module comprising all the others
diff --git a/lib/resource-1.0/english/ParadigmsEng.gf b/lib/resource-1.0/english/ParadigmsEng.gf
index 0ca711c4d..f9abbaf02 100644
--- a/lib/resource-1.0/english/ParadigmsEng.gf
+++ b/lib/resource-1.0/english/ParadigmsEng.gf
@@ -1,4 +1,4 @@
---# -path=.:../abstract:../../prelude
+--# -path=.:../abstract:../../prelude:../common
 
 --1 English Lexical Paradigms
 --
diff --git a/lib/resource-1.0/french/LexiconFre.gf b/lib/resource-1.0/french/LexiconFre.gf
index 336c449cd..79c873a0b 100644
--- a/lib/resource-1.0/french/LexiconFre.gf
+++ b/lib/resource-1.0/french/LexiconFre.gf
@@ -129,7 +129,7 @@ lin
   old_A = 
     prefA (compADeg (mkA "vieux" "vieille" "vieux" "vieillement")) ; ---- vieil
   open_V2 = ouvrir_V2 ;
-  paint_V2A = mkV2A (v2V peindre_V2) accusative ;
+  paint_V2A = mkV2A (v2V peindre_V2) accusative (mkPreposition "en") ;
   paper_N = regN "papier" masculine ;
   paris_PN = mkPN "Paris" masculine ;
   peace_N = regN "paix" feminine ;
diff --git a/lib/resource-1.0/french/ParadigmsFre.gf b/lib/resource-1.0/french/ParadigmsFre.gf
index 5a6a5086b..d0f7531b9 100644
--- a/lib/resource-1.0/french/ParadigmsFre.gf
+++ b/lib/resource-1.0/french/ParadigmsFre.gf
@@ -250,21 +250,21 @@ oper
   aVV   : V -> VV ;  -- "j'arrive à parler"
   mkV2V : V -> Preposition -> Preposition -> V2V ;
   mkVA  : V -> VA ;
-  mkV2A : V -> Preposition -> V2A ;
+  mkV2A : V -> Preposition -> Preposition -> V2A ;
   mkVQ  : V -> VQ ;
   mkV2Q : V -> Preposition -> V2Q ;
 
-  mkAS   : A -> AS ;
+  mkAS  : A -> AS ;
   mkA2S : A -> Preposition -> A2S ;
   mkAV  : A -> Preposition -> AV ;
   mkA2V : A -> Preposition -> Preposition -> A2V ;
 
--- Notice: categories $V2S, V2V, V2A, V2Q$ are in v 1.0 treated
+-- Notice: categories $V2S, V2V, V2Q$ are in v 1.0 treated
 -- just as synonyms of $V2$, and the second argument is given
 -- as an adverb. Likewise $AS, A2S, AV, A2V$ are just $A$.
 -- $V0$ is just $V$.
 
-  V0, V2S, V2V, V2A, V2Q : Type ;
+  V0, V2S, V2V, V2Q : Type ;
   AS, A2S, AV, A2V : Type ;
 
 --2 Definitions of the paradigms
@@ -331,7 +331,7 @@ oper
   dirdirV3 v = dirV3 v complDat ;
 
   V0 : Type = V ;
-  V2S, V2V, V2Q, V2A : Type = V2 ;
+  V2S, V2V, V2Q : Type = V2 ;
   AS, AV : Type = A ;
   A2S, A2V : Type = A2 ;
 
@@ -343,7 +343,7 @@ oper
   aVV  v = v ** {c2 = complDat ; lock_VV = <>} ;
   mkV2V v p t = mkV2 v p ** {c3 = t.p1  ; s3 = p.p2 ; lock_V2V = <>} ;
   mkVA  v = v ** {lock_VA = <>} ;
-  mkV2A v p = mkV2 v p ** {lock_V2A = <>} ;
+  mkV2A v p q = mkV3 v p q ** {lock_V2A = <>} ;
   mkVQ  v = v ** {lock_VQ = <>} ;
   mkV2Q v p = mkV2 v p ** {lock_V2Q = <>} ;
 
diff --git a/lib/resource-1.0/italian/LexiconIta.gf b/lib/resource-1.0/italian/LexiconIta.gf
index ab92c51bb..49d83cbc8 100644
--- a/lib/resource-1.0/italian/LexiconIta.gf
+++ b/lib/resource-1.0/italian/LexiconIta.gf
@@ -128,7 +128,8 @@ lin
   oil_N = regN "olio" ;
   old_A =  prefA (regADeg "vecchio") ;
   open_V2 = dirV2 (verboV (aprire_102 "aprire")) ;
-  paint_V2A = mkV2A (verboV (cingere_31 "pingere")) accusative ;
+  paint_V2A = 
+    mkV2A (verboV (cingere_31 "pingere")) accusative (mkPreposition "in") ;
   paper_N = regN "carta" ;
   paris_PN = mkPN "Parigi" masculine ;
   peace_N = femN (regN "pace") ;
diff --git a/lib/resource-1.0/italian/ParadigmsIta.gf b/lib/resource-1.0/italian/ParadigmsIta.gf
index dea627a9a..1742721c8 100644
--- a/lib/resource-1.0/italian/ParadigmsIta.gf
+++ b/lib/resource-1.0/italian/ParadigmsIta.gf
@@ -248,7 +248,7 @@ oper
   aVV   : V -> VV ;  -- "j'arrive à parler"
   mkV2V : V -> Preposition -> Preposition -> V2V ;
   mkVA  : V -> VA ;
-  mkV2A : V -> Preposition -> V2A ;
+  mkV2A : V -> Preposition -> Preposition -> V2A ;
   mkVQ  : V -> VQ ;
   mkV2Q : V -> Preposition -> V2Q ;
 
@@ -257,12 +257,12 @@ oper
   mkAV  : A -> Preposition -> AV ;
   mkA2V : A -> Preposition -> Preposition -> A2V ;
 
--- Notice: categories $V2S, V2V, V2A, V2Q$ are in v 1.0 treated
+-- Notice: categories $V2S, V2V, V2Q$ are in v 1.0 treated
 -- just as synonyms of $V2$, and the second argument is given
 -- as an adverb. Likewise $AS, A2S, AV, A2V$ are just $A$.
 -- $V0$ is just $V$.
 
-  V0, V2S, V2V, V2A, V2Q : Type ;
+  V0, V2S, V2V, V2Q : Type ;
   AS, A2S, AV, A2V : Type ;
 
 
@@ -354,7 +354,7 @@ oper
   dirdirV3 v = dirV3 v dative ;
 
   V0 : Type = V ;
-  V2S, V2V, V2Q, V2A : Type = V2 ;
+  V2S, V2V, V2Q : Type = V2 ;
   AS, AV : Type = A ;
   A2S, A2V : Type = A2 ;
 
@@ -366,7 +366,7 @@ oper
   aVV  v = v ** {c2 = complDat ; lock_VV = <>} ;
   mkV2V v p t = mkV2 v p ** {c3 = t.p1  ; s3 = p.p2 ; lock_V2V = <>} ;
   mkVA  v = v ** {lock_VA = <>} ;
-  mkV2A v p = mkV2 v p ** {lock_V2A = <>} ;
+  mkV2A v p q = mkV3 v p q ** {lock_V2A = <>} ;
   mkVQ  v = v ** {lock_VQ = <>} ;
   mkV2Q v p = mkV2 v p ** {lock_V2Q = <>} ;
 
diff --git a/lib/resource-1.0/lang.gfprob b/lib/resource-1.0/lang.gfprob
index 28dcd8432..742081a0b 100644
--- a/lib/resource-1.0/lang.gfprob
+++ b/lib/resource-1.0/lang.gfprob
@@ -14,4 +14,4 @@
 --# prob UsePN    0.01
 --# prob yes_Phr  0.02
 --# prob no_Phr   0.02
---# prob TEmpty   0.1
+--# prob TEmpty   0.05
diff --git a/lib/resource-1.0/romance/CatRomance.gf b/lib/resource-1.0/romance/CatRomance.gf
index f7d2c75f6..98e56152d 100644
--- a/lib/resource-1.0/romance/CatRomance.gf
+++ b/lib/resource-1.0/romance/CatRomance.gf
@@ -75,8 +75,8 @@ incomplete concrete CatRomance of Cat =
 -- Open lexical classes, e.g. Lexicon
 
     V, VQ, VA = Verb ;
-    V2, VV, V2A = Verb ** {c2 : Compl} ;
-    V3 = Verb ** {c2,c3 : Compl} ;
+    V2, VV = Verb ** {c2 : Compl} ;
+    V2A, V3 = Verb ** {c2,c3 : Compl} ;
     VS = Verb ** {m : Polarity => Mood} ;
 
     A  = {s : Degree => AForm => Str ; isPre : Bool} ;
diff --git a/lib/resource-1.0/romance/VerbRomance.gf b/lib/resource-1.0/romance/VerbRomance.gf
index 0f3b09719..5fc172c62 100644
--- a/lib/resource-1.0/romance/VerbRomance.gf
+++ b/lib/resource-1.0/romance/VerbRomance.gf
@@ -10,7 +10,8 @@ incomplete concrete VerbRomance of Verb =
 
     ComplV3 v np1 np2 = insertObject v.c3 np2 (insertObject v.c2 np1 (predV v)) ;
 
-    ComplVV v vp = insertComplement (\\a => prepCase v.c2.c ++ infVP vp a) (predV v) ;
+    ComplVV v vp = 
+      insertComplement (\\a => prepCase v.c2.c ++ infVP vp a) (predV v) ;
 
     ComplVS v s  = insertExtrapos (\\b => conjThat ++ s.s ! (v.m ! b)) (predV v) ;
     ComplVQ v q  = insertExtrapos (\\_ => q.s ! QIndir) (predV v) ;
@@ -18,9 +19,14 @@ incomplete concrete VerbRomance of Verb =
     ComplVA v ap = 
       insertComplement (\\a => ap.s ! AF a.g a.n) (predV v) ;
     ComplV2A v np ap = 
+      let af = case v.c3.isDir of {
+        True => AF np.a.g np.a.n ;  -- ... bleues
+        _ => AF Masc Sg             -- il les peint en bleu
+        }
+      in
       insertComplement 
-        (\\a => ap.s ! AF np.a.g np.a.n)
-        (insertObject v.c2 np (predV v)) ;
+        (\\a => v.c3.s ++ prepCase v.c3.c ++ ap.s ! af)
+          (insertObject v.c2 np (predV v)) ;
 
     UseComp comp = insertComplement comp.s (predV copula) ;
 
diff --git a/lib/resource-1.0/spanish/LexiconSpa.gf b/lib/resource-1.0/spanish/LexiconSpa.gf
index 5a38ae085..bb01b102a 100644
--- a/lib/resource-1.0/spanish/LexiconSpa.gf
+++ b/lib/resource-1.0/spanish/LexiconSpa.gf
@@ -127,7 +127,7 @@ lin
    oil_N = regN "aceite" ;
    old_A =  prefA (regADeg "viejo") ;
    open_V2 = dirV2 (special_ppV (regV "abrir") "abierto") ;
-   paint_V2A = mkV2A (regV "pintar") accusative ;
+   paint_V2A = mkV2A (regV "pintar") accusative (mkPreposition "en") ;
    paper_N = regN "papel" ;
    paris_PN = mkPN "Paris" masculine ;
    peace_N = femN (regN "paz") ;
diff --git a/lib/resource-1.0/spanish/ParadigmsSpa.gf b/lib/resource-1.0/spanish/ParadigmsSpa.gf
index 17263b1a5..c65855292 100644
--- a/lib/resource-1.0/spanish/ParadigmsSpa.gf
+++ b/lib/resource-1.0/spanish/ParadigmsSpa.gf
@@ -251,7 +251,7 @@ oper
   aVV   : V -> VV ;  -- "j'arrive à parler"
   mkV2V : V -> Preposition -> Preposition -> V2V ;
   mkVA  : V -> VA ;
-  mkV2A : V -> Preposition -> V2A ;
+  mkV2A : V -> Preposition -> Preposition -> V2A ;
   mkVQ  : V -> VQ ;
   mkV2Q : V -> Preposition -> V2Q ;
 
@@ -260,13 +260,13 @@ oper
   mkAV  : A -> Preposition -> AV ;
   mkA2V : A -> Preposition -> Preposition -> A2V ;
 
--- Notice: categories $V2S, V2V, V2A, V2Q$ are in v 1.0 treated
+-- Notice: categories $V2S, V2V, V2Q$ are in v 1.0 treated
 -- just as synonyms of $V2$, and the second argument is given
 -- as an adverb. Likewise $AS, A2S, AV, A2V$ are just $A$.
 -- $V0$ is just $V$.
 
-  V0, V2S, V2V, V2A, V2Q : Type ;
-  AS, A2S, AV, A2V : Type ;
+  V0, V2S, V2V, V2Q : Type ;
+  AS, A2S, AV, A2V  : Type ;
 
 
 --2 The definitions of the paradigms
@@ -364,7 +364,7 @@ oper
   dirdirV3 v = dirV3 v dative ;
 
   V0 : Type = V ;
-  V2S, V2V, V2Q, V2A : Type = V2 ;
+  V2S, V2V, V2Q : Type = V2 ;
   AS, AV : Type = A ;
   A2S, A2V : Type = A2 ;
 
@@ -376,7 +376,7 @@ oper
   aVV  v = v ** {c2 = complDat ; lock_VV = <>} ;
   mkV2V v p t = mkV2 v p ** {c3 = t.p1  ; s3 = p.p2 ; lock_V2V = <>} ;
   mkVA  v = v ** {lock_VA = <>} ;
-  mkV2A v p = mkV2 v p ** {lock_V2A = <>} ;
+  mkV2A v p q = mkV3 v p q ** {lock_V2A = <>} ;
   mkVQ  v = v ** {lock_VQ = <>} ;
   mkV2Q v p = mkV2 v p ** {lock_V2Q = <>} ;