From 24def1f2ff79a9ca1cb85ff538cd51bd140c2daa Mon Sep 17 00:00:00 2001
From: aarne <aarne@cs.chalmers.se>
Date: Fri, 21 Apr 2006 09:44:55 +0000
Subject: [PATCH] compoundN i ParadigmsEng

---
 lib/resource-1.0/doc/gfdoc/ParadigmsEng.html | 14 +++++++++++---
 lib/resource-1.0/english/ParadigmsEng.gf     |  8 ++++++--
 2 files changed, 17 insertions(+), 5 deletions(-)

diff --git a/lib/resource-1.0/doc/gfdoc/ParadigmsEng.html b/lib/resource-1.0/doc/gfdoc/ParadigmsEng.html
index 38d831ee3..657591e3b 100644
--- a/lib/resource-1.0/doc/gfdoc/ParadigmsEng.html
+++ b/lib/resource-1.0/doc/gfdoc/ParadigmsEng.html
@@ -42,7 +42,8 @@
 <HR NOSHADE SIZE=1>
 <P></P>
 <P>
-Last update: Sat Feb 25 22:35:58 2006
+Author: 
+Last update: Fri Apr 21 11:44:29 2006
 </P>
 <P>
 Produced by 
@@ -50,6 +51,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>
 # -path=.:../abstract:../../prelude:../common
 </P>
 <A NAME="toc1"></A>
@@ -171,9 +175,13 @@ function:
 <A NAME="toc4"></A>
 <H3>Compound nouns</H3>
 <P>
-All the functions above work quite as well to form compound nouns,
-such as <I>baby boom</I>. 
+A compound noun ia an uninflected string attached to an inflected noun,
+such as <I>baby boom</I>, <I>chief executive officer</I>.
 </P>
+<PRE>
+      compoundN : Str -&gt; N -&gt; N ;
+</PRE>
+<P></P>
 <A NAME="toc5"></A>
 <H3>Relational nouns</H3>
 <P>
diff --git a/lib/resource-1.0/english/ParadigmsEng.gf b/lib/resource-1.0/english/ParadigmsEng.gf
index f9abbaf02..067b8bea8 100644
--- a/lib/resource-1.0/english/ParadigmsEng.gf
+++ b/lib/resource-1.0/english/ParadigmsEng.gf
@@ -86,8 +86,10 @@ oper
 
 --3 Compound nouns 
 --
--- All the functions above work quite as well to form compound nouns,
--- such as "baby boom". 
+-- A compound noun ia an uninflected string attached to an inflected noun,
+-- such as "baby boom", "chief executive officer".
+
+  compoundN : Str -> N -> N ;
 
 
 --3 Relational nouns 
@@ -341,6 +343,8 @@ oper
 
   genderN g man = {s = man.s ; g = g ; lock_N = <>} ;
 
+  compoundN s n = {s = \\x,y => s ++ n.s ! x ! y ; g=n.g ; lock_N = <>} ;
+
   mkN2 = \n,p -> n ** {lock_N2 = <> ; c2 = p} ;
   regN2 n = mkN2 (regN n) (mkPreposition "of") ;
   mkN3 = \n,p,q -> n ** {lock_N3 = <> ; c2 = p ; c3 = q} ;