added noun compound form to Swe; commented out Constructions and Documentation in Lang concretes, because their presence makes it impossible to bootstrap the compilation of the library, causing new makes of the library to fail (to be fixed)

lib/src/abstract/Lang.gf

@@ -7,9 +7,9 @@
 
 abstract Lang = 
   Grammar, 
-  Lexicon,
+  Lexicon
-  Construction,
+  ,Construction  --- can be compiled here, but not in concretes, as they call Syntax and Grammar
-  Documentation
+  ,Documentation
   ** {
   flags startcat=Phr ;
   } ;

lib/src/chinese/LangChi.gf

@@ -3,8 +3,8 @@
 
 concrete LangChi of Lang = 
   GrammarChi,
-  LexiconChi,
+  LexiconChi
-  ConstructionChi
+--  ,ConstructionChi
   ** {
 
 flags startcat = Phr ; unlexer = concat ; lexer = text ;

lib/src/danish/ParadigmsDan.gf

@@ -305,7 +305,7 @@ oper
   mkPrep p = {s = p ; lock_Prep = <>} ;
   noPrep = mkPrep [] ;
 
-  mk4N x y z u = mkSubstantive x y z u ** {g = extNGen y ; lock_N = <>} ;
+  mk4N x y z u = mkSubstantive x y z u ** {g = extNGen y ; lock_N = <> ; co = x} ; ---- TODO co
 
   regN x = regGenN x Utr ;
 

lib/src/english/LangEng.gf

@@ -2,9 +2,9 @@
 
 concrete LangEng of Lang = 
   GrammarEng,
-  LexiconEng,
+  LexiconEng
-  ConstructionEng,
+--  ,ConstructionEng,
-  DocumentationEng
+--  ,DocumentationEng
   ** {
 
 flags startcat = Phr ; unlexer = text ; lexer = text ;

lib/src/finnish/LangFin.gf

@@ -2,9 +2,9 @@
 
 concrete LangFin of Lang = 
   GrammarFin, 
-  LexiconFin,
+  LexiconFin
-  ConstructionFin,
+--  , ConstructionFin,
-  DocumentationFin
+--  , DocumentationFin
   ** {
 
 flags startcat = Phr ; unlexer = text ; lexer = finnish ;

lib/src/french/LangFre.gf

@@ -2,9 +2,9 @@
 
 concrete LangFre of Lang = 
   GrammarFre,
-  LexiconFre,
+  LexiconFre
-  DocumentationFre,
+--  ,DocumentationFre
-  ConstructionFre
+--  ,ConstructionFre
   ** {
 
 flags startcat = Phr ; unlexer = text ; lexer = text ;

lib/src/german/LangGer.gf

@@ -2,9 +2,9 @@
 
 concrete LangGer of Lang = 
   GrammarGer,
-  LexiconGer,
+  LexiconGer
-  ConstructionGer,
+--  ,ConstructionGer
-  DocumentationGer
+--  ,DocumentationGer
   ** {
 
 flags startcat = Phr ; unlexer = text ; lexer = text ;

lib/src/norwegian/ParadigmsNor.gf

@@ -284,7 +284,7 @@ oper
   nominative = Nom ;
   genitive = Gen ;
 
-  mk4N x y z u = mkSubstantive x y z u ** {g = extNGen y ; lock_N = <>} ;
+  mk4N x y z u = mkSubstantive x y z u ** {g = extNGen y ; lock_N = <> ; co = x} ; ---- TODO co
 
   regN x = regGenN x g where {
     g = case <x : Str> of {

lib/src/scandinavian/NounScand.gf

@@ -142,6 +142,7 @@ incomplete concrete NounScand of Noun =
       s = f.s ;
       g = f.g ;
       c2 = f.c2 ;
+      co = f.co ;
       isMod = False
       } ;
 
@@ -149,6 +150,7 @@ incomplete concrete NounScand of Noun =
       s = f.s ;
       g = f.g ;
       c2 = f.c3 ;
+      co = f.co ;
       isMod = False
       } ;
 
@@ -163,6 +165,7 @@ incomplete concrete NounScand of Noun =
       s = \\n,d,c => f.s ! n ! d ! Nom ++ f.c2.s ++ x.s ! accusative ; 
       g = f.g ;
       c2 = f.c3 ;
+      co = f.co ;
       isMod = False
       } ;
 

lib/src/scandinavian/ResScand.gf

@@ -14,7 +14,7 @@ interface ResScand = DiffScand ** open CommonScand, Prelude in {
       p = P3
       } ;
 
-    Noun = {s : Number => Species => Case => Str ; g : NGender} ;
+    Noun = {s : Number => Species => Case => Str ; g : NGender ; co : Str} ; -- co = compounding form
 
 -- needed for VP conjunction
   param

lib/src/swedish/ExtraSwe.gf

@@ -125,17 +125,20 @@ lin
  
   CompoundNomN a b = {
     s = \\n,d,c => a.s ! Sg ! Indef ! Nom ++ BIND ++ b.s ! n ! d ! c ;
-    g = b.g
+    g = b.g ;
+    co = b.co
     } ;
 
   CompoundGenN a b = {
     s = \\n,d,c => a.s ! Sg ! Indef ! Gen ++ BIND ++ b.s ! n ! d ! c ;
-    g = b.g
+    g = b.g ;
+    co = b.co
     } ;
 
   CompoundAdjN a b = {
     s = \\n,d,c => a.s ! AF (APosit (Strong (GSg Utr))) Nom ++ BIND ++ b.s ! n ! d ! c ;
-    g = b.g
+    g = b.g ;
+    co = b.co
     } ;
 
 

lib/src/swedish/LangSwe.gf

@@ -2,9 +2,9 @@
 
 concrete LangSwe of Lang = 
   GrammarSwe,
-  LexiconSwe,
+  LexiconSwe
-  ConstructionSwe,
+--  ,ConstructionSwe
-  DocumentationSwe
+--  ,DocumentationSwe
   ** {
 
 flags startcat = Phr ;  unlexer = text ; lexer = text ;

lib/src/swedish/ParadigmsSwe.gf

@@ -95,12 +95,17 @@ oper
 
 -- and perhaps a gender.
 
-    mkN : (museum,museet,museer,museerna : Str) -> Gender -> N -- even worse case for nouns
+    mkN : (museum,museet,museer,museerna : Str) -> Gender -> N ; -- even worse case for nouns
-  } ;
 
 -- All the functions above work quite as well to form *compound nouns*,
--- such as "fotboll". 
+-- such as "fotboll", just given as one argument. But compound nouns can be formed from their parts as well,
 
+    mkN : (regering, makt : N) -> N ;   -- regeringsmakt, using the co form of regering
+    } ;
+
+-- The default compound form can be changed:
+
+    changeCompoundN : Str -> N -> N ;   -- kyrko + kyrka_N
 
 
 --3 Relational nouns 
@@ -350,21 +355,48 @@ oper
     mkN : Str -> Gender -> N = regGenN ; 
     mkN : (nyckel, nycklar : Str) -> N = mk2N ; 
     mkN : (museum,museet,museer,museerna : Str) -> N = mk4N ;
-    mkN : (museum,museet,museer,museerna : Str) -> Gender -> N = mk5N
+    mkN : (museum,museet,museer,museerna : Str) -> Gender -> N = mk5N ;
-  } ;
+    mkN : (regering, makt : N) -> N = \a,b -> lin N {
+      s = \\n,d,c => a.co + b.s ! n ! d ! c ;
+      g = b.g ;
+      co = case b.co  of {
+        _ + "s" => a.co + b.co ;
+        co => a.co + co + "s"
+        }
+      } ;
+    } ;
 
-  mk4N : (museum,museet,museer,museerna : Str) -> N = \apa,apan,apor,aporna ->  {
+-- The default compound form can be changed:
-    s = nounForms apa apan apor aporna ;
+
-    g = case last apan of {
+    changeCompoundN : Str -> N -> N = \co,n -> lin N {
-      "n" => Utr ;
+      s = n.s ;
-      _ => Neutr
+      g = n.g ;
+      co = co 
+      } ;
+
+
+  mk4N : (museum,museet,museer,museerna : Str) -> N = \apa,apan,apor,aporna ->  
+    mk5N apa apan apor aporna g 
+     where {
+       g = case last apan of {
+         "n" => Utr ;
+        _ => Neutr
       }
-    } ** {lock_N = <>} ;
+    } ;
 
-  mk5N : (museum,museet,museer,museerna : Str) -> Gender -> N = \apa,apan,apor,aporna,g ->  {
+  mk5N : (museum,museet,museer,museerna : Str) -> Gender -> N = \apa,apan,apor,aporna,g ->  lin N {
     s = nounForms apa apan apor aporna ;
-    g = g
+    g = g ;
-    } ** {lock_N = <>} ;
+    co = case apa of {  
+      ap + "e" => case g of {
+        Neutr => apa + "s" ;              -- rikes
+        _     => ap                       -- pojk
+        } ;
+      ap + "a" => ap ;                    -- flick
+      ? + ? + ? + _ + ("ing" | "ion" | "het") => apa + "s" ;  -- regerings, stations, frihets
+      _ => apa
+      }
+    } ;
 
   regN : Str -> N = \bil -> regGenN bil g where {
     g = case <bil : Str> of {