From 05d13ef582799f702aa52ef6cdc8c1ba07d62c16 Mon Sep 17 00:00:00 2001
From: aarne <aarne@cs.chalmers.se>
Date: Tue, 21 Feb 2006 17:31:54 +0000
Subject: [PATCH] updated and tested Mathematical

---
 lib/resource-1.0/mathematical/Mathematical.gf |  2 ++
 .../mathematical/MathematicalEng.gf           |  2 ++
 .../mathematical/MathematicalFin.gf           |  2 ++
 .../mathematical/MathematicalFre.gf           |  4 ++-
 .../mathematical/MathematicalGer.gf           |  2 ++
 .../mathematical/MathematicalIta.gf           |  2 ++
 .../mathematical/MathematicalNor.gf           | 27 +++++++++++++++++++
 .../mathematical/MathematicalSpa.gf           |  2 ++
 .../mathematical/MathematicalSwe.gf           |  3 +++
 .../mathematical/PredicationNor.gf            |  3 +++
 lib/resource-1.0/mathematical/SymbolEng.gf    |  3 ++-
 lib/resource-1.0/mathematical/SymbolFin.gf    | 21 ++++++++-------
 lib/resource-1.0/mathematical/SymbolGer.gf    | 17 +++++++-----
 lib/resource-1.0/mathematical/SymbolNor.gf    |  2 ++
 .../mathematical/SymbolRomance.gf             | 15 ++++++-----
 lib/resource-1.0/mathematical/SymbolScand.gf  |  3 ++-
 16 files changed, 84 insertions(+), 26 deletions(-)
 create mode 100644 lib/resource-1.0/mathematical/MathematicalNor.gf
 create mode 100644 lib/resource-1.0/mathematical/PredicationNor.gf
 create mode 100644 lib/resource-1.0/mathematical/SymbolNor.gf

diff --git a/lib/resource-1.0/mathematical/Mathematical.gf b/lib/resource-1.0/mathematical/Mathematical.gf
index 093d192af..a623862b8 100644
--- a/lib/resource-1.0/mathematical/Mathematical.gf
+++ b/lib/resource-1.0/mathematical/Mathematical.gf
@@ -20,6 +20,8 @@ abstract Mathematical =
   Relative,
   Conjunction,
   Phrase,
+  Text,
+  Idiom,
   Structural,
 
   Symbol,
diff --git a/lib/resource-1.0/mathematical/MathematicalEng.gf b/lib/resource-1.0/mathematical/MathematicalEng.gf
index d4d855b3b..3cae4c947 100644
--- a/lib/resource-1.0/mathematical/MathematicalEng.gf
+++ b/lib/resource-1.0/mathematical/MathematicalEng.gf
@@ -12,6 +12,8 @@ concrete MathematicalEng of Mathematical =
   ConjunctionEng,
   PhraseEng,
   StructuralEng,
+  TextX,
+  IdiomEng,
 
   SymbolEng,
   PredicationEng,
diff --git a/lib/resource-1.0/mathematical/MathematicalFin.gf b/lib/resource-1.0/mathematical/MathematicalFin.gf
index 140082cdd..960729a80 100644
--- a/lib/resource-1.0/mathematical/MathematicalFin.gf
+++ b/lib/resource-1.0/mathematical/MathematicalFin.gf
@@ -11,6 +11,8 @@ concrete MathematicalFin of Mathematical =
   RelativeFin,
   ConjunctionFin,
   PhraseFin,
+  TextX,
+  IdiomFin,
   StructuralFin,
 
   SymbolFin,
diff --git a/lib/resource-1.0/mathematical/MathematicalFre.gf b/lib/resource-1.0/mathematical/MathematicalFre.gf
index 8d07e2e08..1bffa135d 100644
--- a/lib/resource-1.0/mathematical/MathematicalFre.gf
+++ b/lib/resource-1.0/mathematical/MathematicalFre.gf
@@ -11,8 +11,10 @@ concrete MathematicalFre of Mathematical =
   RelativeFre,
   ConjunctionFre,
   PhraseFre,
+  TextX,
+  IdiomFre,
   StructuralFre,
-
+  
   SymbolFre,
   PredicationFre - [predV3], ---- gf bug
 
diff --git a/lib/resource-1.0/mathematical/MathematicalGer.gf b/lib/resource-1.0/mathematical/MathematicalGer.gf
index ea58cf85a..d3928ff21 100644
--- a/lib/resource-1.0/mathematical/MathematicalGer.gf
+++ b/lib/resource-1.0/mathematical/MathematicalGer.gf
@@ -11,6 +11,8 @@ concrete MathematicalGer of Mathematical =
   RelativeGer,
   ConjunctionGer,
   PhraseGer,
+  TextX,
+  IdiomGer,
   StructuralGer,
 
   SymbolGer,
diff --git a/lib/resource-1.0/mathematical/MathematicalIta.gf b/lib/resource-1.0/mathematical/MathematicalIta.gf
index c9ff3ac8f..7095536ae 100644
--- a/lib/resource-1.0/mathematical/MathematicalIta.gf
+++ b/lib/resource-1.0/mathematical/MathematicalIta.gf
@@ -11,6 +11,8 @@ concrete MathematicalIta of Mathematical =
   RelativeIta,
   ConjunctionIta,
   PhraseIta,
+  TextX,
+  IdiomIta,
   StructuralIta,
 
   SymbolIta,
diff --git a/lib/resource-1.0/mathematical/MathematicalNor.gf b/lib/resource-1.0/mathematical/MathematicalNor.gf
new file mode 100644
index 000000000..2fb2a9f86
--- /dev/null
+++ b/lib/resource-1.0/mathematical/MathematicalNor.gf
@@ -0,0 +1,27 @@
+--# -path=.:../norwegian:../scandinavian:../abstract:../common:prelude
+
+concrete MathematicalNor of Mathematical = 
+  NounNor - [ComplN2], --- to avoid ambiguity 
+--  VerbNor, 
+--  AdjectiveNor,
+--  AdverbNor,
+  NumeralNor,
+--  SentenceNor,
+  QuestionNor,
+  RelativeNor,
+  ConjunctionNor,
+  PhraseNor,
+  TextX,
+  IdiomNor,
+
+  StructuralNor,
+
+  SymbolNor,
+  PredicationNor,
+
+  LexiconNor
+  ** {
+
+flags startcat = Phr ;
+
+} ;
diff --git a/lib/resource-1.0/mathematical/MathematicalSpa.gf b/lib/resource-1.0/mathematical/MathematicalSpa.gf
index 578c5829a..e45e40e61 100644
--- a/lib/resource-1.0/mathematical/MathematicalSpa.gf
+++ b/lib/resource-1.0/mathematical/MathematicalSpa.gf
@@ -11,6 +11,8 @@ concrete MathematicalSpa of Mathematical =
   RelativeSpa,
   ConjunctionSpa,
   PhraseSpa,
+  TextSpa,
+  IdiomSpa,
   StructuralSpa,
 
   SymbolSpa,
diff --git a/lib/resource-1.0/mathematical/MathematicalSwe.gf b/lib/resource-1.0/mathematical/MathematicalSwe.gf
index d04f745ac..b08380085 100644
--- a/lib/resource-1.0/mathematical/MathematicalSwe.gf
+++ b/lib/resource-1.0/mathematical/MathematicalSwe.gf
@@ -11,6 +11,9 @@ concrete MathematicalSwe of Mathematical =
   RelativeSwe,
   ConjunctionSwe,
   PhraseSwe,
+  TextX,
+  IdiomSwe,
+
   StructuralSwe,
 
   SymbolSwe,
diff --git a/lib/resource-1.0/mathematical/PredicationNor.gf b/lib/resource-1.0/mathematical/PredicationNor.gf
new file mode 100644
index 000000000..5af878c97
--- /dev/null
+++ b/lib/resource-1.0/mathematical/PredicationNor.gf
@@ -0,0 +1,3 @@
+concrete PredicationNor of Predication = CatNor ** PredicationI with
+  (Lang = LangNor) ;
+
diff --git a/lib/resource-1.0/mathematical/SymbolEng.gf b/lib/resource-1.0/mathematical/SymbolEng.gf
index a231714cb..0b7911fc8 100644
--- a/lib/resource-1.0/mathematical/SymbolEng.gf
+++ b/lib/resource-1.0/mathematical/SymbolEng.gf
@@ -3,6 +3,7 @@ concrete SymbolEng of Symbol = CatEng ** open Prelude, ResEng in {
 lin
   SymbPN i = {s = \\c => i.s ; a = agrP3 Sg} ; --- c
   IntPN i  = {s = \\c => i.s ; a = agrP3 Sg} ; --- c
+  FloatPN i = {s = \\c => i.s ; a = agrP3 Sg} ; --- c
   CNIntNP cn i = {
     s = \\c => (cn.s ! Sg ! Nom ++ i.s) ;
     a = agrP3 Sg
@@ -14,7 +15,7 @@ lin
 
 lincat 
 
-  Symb, SymbList = SS ;
+  Symb, [Symb] = SS ;
 
 lin
 
diff --git a/lib/resource-1.0/mathematical/SymbolFin.gf b/lib/resource-1.0/mathematical/SymbolFin.gf
index 1ebee37a7..30324b653 100644
--- a/lib/resource-1.0/mathematical/SymbolFin.gf
+++ b/lib/resource-1.0/mathematical/SymbolFin.gf
@@ -1,21 +1,24 @@
-concrete SymbolFin of Symbol = CatFin ** open Prelude, ResFin in {
+concrete SymbolFin of Symbol = CatFin ** open Prelude, NounFin, ResFin in {
 
 lin
   SymbPN i = {s = \\c => i.s} ; --- c
   IntPN i  = {s = \\c => i.s} ; --- c
-{-
+  FloatPN i  = {s = \\c => i.s} ; --- c
+
   CNIntNP cn i = {
-    s = \\c => (cn.s ! Sg ! DIndef ! Nom ++ i.s) ;
-    a = agrP3 cn.g Sg
+    s = \\c => cn.s ! NCase Sg (npform2case c) ++ i.s ;
+    a = agrP3 Sg ;
+    isPron = False
     } ;
-  CNSymbNP det cn xs = let g = cn.g in {
-    s = \\c => det.s ! cn.isMod ! g ++ cn.s ! det.n ! det.det ! caseNP c ++ xs.s ; 
-    a = agrP3 g det.n
+  CNSymbNP det cn xs = let detcn = NounFin.DetCN det cn in {
+    s = \\c => detcn.s ! c ++ xs.s ;
+    a = detcn.a ;
+    isPron = False
     } ;
--}
+
 lincat 
 
-  Symb, SymbList = SS ;
+  Symb, [Symb] = SS ;
 
 lin
 
diff --git a/lib/resource-1.0/mathematical/SymbolGer.gf b/lib/resource-1.0/mathematical/SymbolGer.gf
index 0c5895747..e35ed1a4c 100644
--- a/lib/resource-1.0/mathematical/SymbolGer.gf
+++ b/lib/resource-1.0/mathematical/SymbolGer.gf
@@ -3,19 +3,22 @@ concrete SymbolGer of Symbol = CatGer ** open Prelude, ResGer in {
 lin
   SymbPN i = {s = \\c => i.s ; g = Neutr} ; --- c
   IntPN i  = {s = \\c => i.s ; g = Neutr} ; --- c
-{-
+  FloatPN i  = {s = \\c => i.s ; g = Neutr} ; --- c
+
   CNIntNP cn i = {
-    s = \\c => (cn.s ! Sg ! DIndef ! Nom ++ i.s) ;
-    a = agrP3 cn.g Sg
+    s = \\c => cn.s ! Weak ! Sg ! Nom ++ i.s ;
+    a = agrP3 Sg ;
+    isPron = False
     } ;
   CNSymbNP det cn xs = let g = cn.g in {
-    s = \\c => det.s ! cn.isMod ! g ++ cn.s ! det.n ! det.det ! caseNP c ++ xs.s ; 
-    a = agrP3 g det.n
+    s = \\c => det.s ! g ! c ++ cn.s !  adjfCase det.a c ! det.n ! c ++ xs.s ; 
+    a = agrP3 det.n ;
+    isPron = False
     } ;
--}
+
 lincat 
 
-  Symb, SymbList = SS ;
+  Symb, [Symb] = SS ;
 
 lin
 
diff --git a/lib/resource-1.0/mathematical/SymbolNor.gf b/lib/resource-1.0/mathematical/SymbolNor.gf
new file mode 100644
index 000000000..2e446b09b
--- /dev/null
+++ b/lib/resource-1.0/mathematical/SymbolNor.gf
@@ -0,0 +1,2 @@
+concrete SymbolNor of Symbol = CatNor ** SymbolScand with
+  (ResScand = ResNor) ;
diff --git a/lib/resource-1.0/mathematical/SymbolRomance.gf b/lib/resource-1.0/mathematical/SymbolRomance.gf
index 241c9dd4f..9b0586c74 100644
--- a/lib/resource-1.0/mathematical/SymbolRomance.gf
+++ b/lib/resource-1.0/mathematical/SymbolRomance.gf
@@ -4,21 +4,22 @@ incomplete concrete SymbolRomance of Symbol =
 lin
   SymbPN i = {s = i.s ; g = Masc} ;
   IntPN i  = {s = i.s ; g = Masc} ;
+  FloatPN i  = {s = i.s ; g = Masc} ;
 
-{-
   CNIntNP cn i = {
-    s = \\c => (cn.s ! Sg ! DIndef ! Nom ++ i.s) ;
-    a = agrP3 cn.g Sg
+    s = \\c => cn.s ! Sg ++ i.s ;
+    a = agrP3 cn.g Sg ;
+    hasClit = False
     } ;
   CNSymbNP det cn xs = let g = cn.g in {
-    s = \\c => det.s ! g ++ cn.s ! det.n ! det.det ! caseNP c ++ xs.s ; 
-    a = agrP3 g det.n
+    s = \\c => det.s ! g ! npform2case c ++ cn.s ! det.n ++ xs.s ; 
+    a = agrP3 g det.n ;
+    hasClit = False
     } ;
--}
 
 lincat 
 
-  Symb, SymbList = SS ;
+  Symb, [Symb] = SS ;
 
 lin
 
diff --git a/lib/resource-1.0/mathematical/SymbolScand.gf b/lib/resource-1.0/mathematical/SymbolScand.gf
index e09628aaa..e92aee439 100644
--- a/lib/resource-1.0/mathematical/SymbolScand.gf
+++ b/lib/resource-1.0/mathematical/SymbolScand.gf
@@ -4,6 +4,7 @@ incomplete concrete SymbolScand of Symbol =
 lin
   SymbPN i = {s = \\c => i.s ; g = Neutr} ; --- c
   IntPN i  = {s = \\c => i.s ; g = Neutr} ; --- c
+  FloatPN i  = {s = \\c => i.s ; g = Neutr} ; --- c
   CNIntNP cn i = {
     s = \\c => (cn.s ! Sg ! DIndef ! Nom ++ i.s) ;
     a = agrP3 cn.g Sg
@@ -15,7 +16,7 @@ lin
 
 lincat 
 
-  Symb, SymbList = SS ;
+  Symb, [Symb] = SS ;
 
 lin