From 21dd20f415415a1241b3bfa98d0d5b6a3d926b8f Mon Sep 17 00:00:00 2001
From: aarne <unknown>
Date: Thu, 3 Jun 2004 19:31:39 +0000
Subject: [PATCH] SymbPN and SymbCN in resources

---
 resource-0.6/abstract/Combinations.gf       | 3 +++
 resource-0.6/english/CombinationsEng.gf     | 5 +++++
 resource-0.6/english/ParadigmsEng.gf        | 1 +
 resource-0.6/finnish/CombinationsFin.gf     | 5 +++++
 resource-0.6/german/CombinationsGer.gf      | 5 +++++
 resource-0.6/romance/CombinationsRomance.gf | 5 +++++
 resource-0.6/russian/CombinationsRus.gf     | 8 ++++++++
 resource-0.6/swedish/CombinationsSwe.gf     | 8 ++++++++
 8 files changed, 40 insertions(+)

diff --git a/resource-0.6/abstract/Combinations.gf b/resource-0.6/abstract/Combinations.gf
index af15f1969..c354e2613 100644
--- a/resource-0.6/abstract/Combinations.gf
+++ b/resource-0.6/abstract/Combinations.gf
@@ -168,6 +168,9 @@ fun
   UseFun      : Fun -> CN ;                -- "successor"
   UseInt      : Int -> Num ;               -- "32"  --- assumes i > 1
 
+  SymbPN      : String -> PN ;             -- "x"
+  SymbCN      : CN -> String -> CN ;       -- "number x"
+
   ModAdj      : AP -> CN -> CN ;           -- "red car"
   DetNP       : Det -> CN -> NP ;          -- "every car"
   MassNP      : CN -> NP ;                 -- "wine"
diff --git a/resource-0.6/english/CombinationsEng.gf b/resource-0.6/english/CombinationsEng.gf
index 3c911b6ba..15c78277a 100644
--- a/resource-0.6/english/CombinationsEng.gf
+++ b/resource-0.6/english/CombinationsEng.gf
@@ -104,6 +104,11 @@ lin
   UseInt i = {s = table {Nom => i.s ; Gen => i.s ++ "'s"}} ; ---
   NoNum = noNum ;
 
+  SymbPN i = {s = table {Nom => i.s ; Gen => i.s ++ "'s"}} ; ---
+  SymbCN cn s =
+    {s = \\n,c => cn.s ! n ! c ++ s.s ; 
+     g = cn.g} ;
+
   PredVP = predVerbPhrase ;
   PosVG  = predVerbGroup True ;
   NegVG  = predVerbGroup False ;
diff --git a/resource-0.6/english/ParadigmsEng.gf b/resource-0.6/english/ParadigmsEng.gf
index 81571e47e..119408281 100644
--- a/resource-0.6/english/ParadigmsEng.gf
+++ b/resource-0.6/english/ParadigmsEng.gf
@@ -81,6 +81,7 @@ oper
   mkFunCN  : CN -> Preposition -> Fun ;
   funOfCN : CN -> Fun ;
 
+
 --2 Adjectives
 
 -- Non-comparison one-place adjectives just have one form.
diff --git a/resource-0.6/finnish/CombinationsFin.gf b/resource-0.6/finnish/CombinationsFin.gf
index 48e886b56..677fe5dcb 100644
--- a/resource-0.6/finnish/CombinationsFin.gf
+++ b/resource-0.6/finnish/CombinationsFin.gf
@@ -101,6 +101,11 @@ lin
   NoNum = noNum ;
   UseInt i = {s = \\_ => i.s ; isNum = True} ; --- case endings sometimes needed
 
+  SymbPN i = {s = \\_ => i.s} ;  --- case endings often needed
+  SymbCN cn s =
+    {s = \\f,n,c => cn.s ! f ! n ! c ++ s.s ; 
+     g = cn.g} ;
+
   CNthatS = nounThatSentence ;
 
   PredVP = predVerbPhrase ;
diff --git a/resource-0.6/german/CombinationsGer.gf b/resource-0.6/german/CombinationsGer.gf
index c6d3e7ea7..e8b466a3b 100644
--- a/resource-0.6/german/CombinationsGer.gf
+++ b/resource-0.6/german/CombinationsGer.gf
@@ -109,6 +109,11 @@ lin
   PosVG  = predVerbGroup True ;
   NegVG  = predVerbGroup False ;
 
+  SymbPN i = {s = \\_ => i.s} ;
+  SymbCN cn s =
+    {s = \\a,n,c => cn.s ! a ! n ! c ++ s.s ; 
+     g = cn.g} ;
+
   PredV  = predVerb ;
   PredAP = predAdjective ;
   PredCN = predCommNoun ;
diff --git a/resource-0.6/romance/CombinationsRomance.gf b/resource-0.6/romance/CombinationsRomance.gf
index f9cb36c30..0e6ac8e70 100644
--- a/resource-0.6/romance/CombinationsRomance.gf
+++ b/resource-0.6/romance/CombinationsRomance.gf
@@ -103,6 +103,11 @@ lin
   UseInt i = {s = \\_ => i.s} ;
   NoNum = noNum ;
 
+  SymbPN i = {s = i.s ; g = Masc} ; --- cannot know gender
+  SymbCN cn s =
+    {s = \\n => cn.s ! n ++ s.s ; 
+     g = cn.g} ;
+
   CNthatS = nounThatSentence ;
 
   PredVP = predVerbPhrase ;
diff --git a/resource-0.6/russian/CombinationsRus.gf b/resource-0.6/russian/CombinationsRus.gf
index 57ed7751e..6c04da51e 100644
--- a/resource-0.6/russian/CombinationsRus.gf
+++ b/resource-0.6/russian/CombinationsRus.gf
@@ -132,6 +132,14 @@ lin
   UseInt i = useInt i.s;
   NoNum = noNum ;
 
+  --- these two by AR 3/6/2004
+  SymbPN i = {s = \\_ => i.s ; g = Neut ; anim = Inanimate} ; ---
+  SymbCN cn s =
+    {s = \\n,c => cn.s ! n ! c ++ s.s ; 
+     g = cn.g ;
+     anim = cn.anim
+    } ;
+
 
   DetNP = detNounPhrase ;
   IndefOneNP = indefNounPhrase Sg ;
diff --git a/resource-0.6/swedish/CombinationsSwe.gf b/resource-0.6/swedish/CombinationsSwe.gf
index 6bcf1a6da..68680e46e 100644
--- a/resource-0.6/swedish/CombinationsSwe.gf
+++ b/resource-0.6/swedish/CombinationsSwe.gf
@@ -103,6 +103,14 @@ lin
   UseInt i = {s = table {Nom => i.s ; Gen => i.s ++ "s"}} ; ---
   NoNum = noNum ;
 
+  SymbPN i = {s = \\_ => i.s ; g = Neutr ; x = NoMasc} ;
+  SymbCN cn s =
+    {s = \\a,n,c => cn.s ! a ! n ! c ++ s.s ; 
+     g = cn.g ;
+     x = cn.x ;
+     p = cn.p
+     } ;
+
   CNthatS = nounThatSentence ;
 
   PredVP = predVerbPhrase ;