simplified 1.5 by removing mathematical/

2 files changed, 43 insertions, 3 deletions

diff --git a/next-lib/src/finnish/ExtraFin.gf b/next-lib/src/finnish/ExtraFin.gf
index 5a2bba75b..5af232ef0 100644
--- a/next-lib/src/finnish/ExtraFin.gf
+++ b/next-lib/src/finnish/ExtraFin.gf
@@ -68,12 +68,10 @@ concrete ExtraFin of ExtraFinAbs = CatFin **
         isPron = False
         } ;
 
-
     vai_Conj = {s1 = [] ; s2 = "vai" ; n = Sg} ;
 
-
     CompPartAP ap = {
-      s = \\agr => ap.s ! False ! AN (NCase agr.n Part)
+      s = \\agr => ap.s ! False ! NCase agr.n Part
       } ;
 
 } 
diff --git a/next-lib/src/finnish/SymbolFin.gf b/next-lib/src/finnish/SymbolFin.gf
new file mode 100644
index 000000000..922b19dcb
--- /dev/null
+++ b/next-lib/src/finnish/SymbolFin.gf
@@ -0,0 +1,42 @@
+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
+  NumPN i  = {s = \\c => i.s!Sg!Nom } ; --- c
+
+  CNIntNP cn i = {
+    s = \\c => cn.s ! NCase Sg (npform2case Sg c) ++ i.s ;
+    a = agrP3 Sg ;
+    isPron = False
+    } ;
+  CNSymbNP det cn xs = let detcn = NounFin.DetCN det cn in {
+    s = \\c => detcn.s ! c ++ xs.s ;
+    a = detcn.a ;
+    isPron = False
+    } ;
+  CNNumNP cn i = {
+    s = \\c => cn.s ! NCase Sg (npform2case Sg c) ++ i.s ! Sg ! Nom ;
+    a = agrP3 Sg ;
+    isPron = False
+    } ;
+
+  SymbS sy = sy ;
+
+  SymbNum n = {s = \\_,_ => n.s ; isNum = True ; n = Pl} ;
+  SymbOrd n = {s = \\_,_ => n.s ++ "."} ;
+
+lincat 
+
+  Symb, [Symb] = SS ;
+
+lin
+
+  MkSymb s = s ;
+
+  BaseSymb = infixSS "ja" ;
+  ConsSymb = infixSS "," ;
+
+}
+