slight modifs in Bronzeage, adapted to next-lib

17 files changed, 385 insertions, 308 deletions

diff --git a/examples/bronzeage/Bronzeage.gf b/examples/bronzeage/Bronzeage.gf
index c918c3241..bf8f8fff2 100644
--- a/examples/bronzeage/Bronzeage.gf
+++ b/examples/bronzeage/Bronzeage.gf
@@ -1,31 +1,45 @@
-abstract Bronzeage = Cat, Swadesh ** {
+abstract Bronzeage = Swadesh ** {
 
   flags startcat = Phr ; 
 
   cat
-    Sent ; MassCN ;
+    Phr ;
+    Imp ;
+    Cl ;
+    CN ;
+
+    V ;
+    V2 ;
+    V3 ;
+    A ;
+    Pron ;
+    Det ;
+    Card ;
+    Prep ;
+
+    MassCN ;
 
   fun
-    PhrPos    : Sent -> Phr ;
-    PhrNeg    : Sent -> Phr ;
-    PhrQuest  : Sent -> Phr ;
-    PhrImp    : Imp  -> Phr ;    
-    PhrImpNeg : Imp  -> Phr ;    
-
-    SentV  : V  -> NP -> Sent ;
-    SentV2 : V2 -> NP -> NP -> Sent ;
-    SentV2Mass : V2 -> NP -> MassCN -> Sent ;
-    SentV3 : V3 -> NP -> NP -> NP -> Sent ;
-    SentA  : A  -> NP -> Sent ;
-    SentNP : NP -> NP -> Sent ;
-
-    SentAdvV  : V  -> NP -> Adv -> Sent ;
-    SentAdvV2 : V2 -> NP -> NP -> Adv -> Sent ;
+    PhrPos    : Cl -> Phr ;
+    PhrNeg    : Cl -> Phr ;
+    PhrQuest  : Cl -> Phr ;
+    PhrIAdv   : IAdv -> Cl -> Phr ;
+    PhrImp    : Imp -> Phr ;    
+    PhrImpNeg : Imp -> Phr ;    
+
+    SentV  : V  -> NP -> Cl ;
+    SentV2 : V2 -> NP -> NP -> Cl ;
+    SentV2Mass : V2 -> NP -> MassCN -> Cl ;
+    SentV3 : V3 -> NP -> NP -> NP -> Cl ;
+    SentA  : A  -> NP -> Cl ;
+    SentNP : NP -> NP -> Cl ;
+
+    SentAdvV  : V  -> NP -> Adv -> Cl ;
+    SentAdvV2 : V2 -> NP -> NP -> Adv -> Cl ;
 
     ImpV  : V -> Imp ;
     ImpV2 : V2 -> NP -> Imp ;
 
-    UsePron : Pron -> NP ;
     DetCN : Det -> CN -> NP ;
     NumCN : Card -> CN -> NP ;
 
@@ -35,4 +49,10 @@ abstract Bronzeage = Cat, Swadesh ** {
     UseMassN : MassN -> MassCN ;
     ModMass : A -> MassCN -> MassCN ;
 
+-- new
+    DefCN : CN -> NP ;
+    IndefCN : CN -> NP ;
+    PrepNP : Prep -> NP -> Adv ;
+    on_Prep : Prep ;
+
 }
diff --git a/examples/bronzeage/BronzeageEng.gf b/examples/bronzeage/BronzeageEng.gf
index 04ff53a3c..162a41705 100644
--- a/examples/bronzeage/BronzeageEng.gf
+++ b/examples/bronzeage/BronzeageEng.gf
@@ -1,7 +1,7 @@
---# -path=.:present:prelude
+--# -path=.:present
 
-concrete BronzeageEng of Bronzeage = CatEng, SwadeshEng ** BronzeageI with
-  (Lang = LangEng) ** {
+concrete BronzeageEng of Bronzeage = SwadeshEng ** BronzeageI with
+  (Syntax = SyntaxEng) ** open ResEng in {
   flags language = en_US;
 }
 
diff --git a/examples/bronzeage/BronzeageFin.gf b/examples/bronzeage/BronzeageFin.gf
index cc5940d4e..b17fe24f1 100644
--- a/examples/bronzeage/BronzeageFin.gf
+++ b/examples/bronzeage/BronzeageFin.gf
@@ -1,7 +1,7 @@
---# -path=.:present:prelude
+--# -path=.:present
 
-concrete BronzeageFin of Bronzeage = CatFin, SwadeshFin **  BronzeageI with
-  (Lang = LangFin) ** {
+concrete BronzeageFin of Bronzeage = SwadeshFin **  BronzeageI with
+  (Syntax = SyntaxFin) ** open ResFin in {
   flags language = fi_FI;
 }
 
diff --git a/examples/bronzeage/BronzeageFre.gf b/examples/bronzeage/BronzeageFre.gf
new file mode 100644
index 000000000..03942ab45
--- /dev/null
+++ b/examples/bronzeage/BronzeageFre.gf
@@ -0,0 +1,8 @@
+--# -path=.:present
+
+concrete BronzeageFre of Bronzeage = SwadeshFre **  BronzeageI with
+  (Syntax = SyntaxFre) ** open ResFre in {
+  flags language = sv_SE;
+}
+
+
diff --git a/examples/bronzeage/BronzeageI.gf b/examples/bronzeage/BronzeageI.gf
index 8e4d7abee..86925f277 100644
--- a/examples/bronzeage/BronzeageI.gf
+++ b/examples/bronzeage/BronzeageI.gf
@@ -1,59 +1,46 @@
-incomplete concrete BronzeageI of Bronzeage = open Lang in {
-
-  flags 
-    optimize = all_subs ; --optimize = share_subs ;
-    unlexer = text ; lexer = text ;
+incomplete concrete BronzeageI of Bronzeage = open Syntax in {
 
   lincat
-    Sent = {s : SForm => Str} ; MassCN = CN ;
+    Phr = Syntax.Phr ;
+    Imp = Syntax.Imp ;
+    Cl = Syntax.Cl ;
+    CN = Syntax.CN ;
+    MassCN = Syntax.CN ;
 
   lin
-    PhrPos sent = {s = sent.s ! SPos ++ "."} ;
-    PhrNeg sent = {s = sent.s ! SNeg ++ "."} ;
-    PhrQuest sent = {s = sent.s ! SQuest ++ "?"} ;
-    PhrImp imp = {s = (PhrUtt NoPConj (UttImpSg PPos imp) NoVoc).s ++ "!"} ;
-    PhrImpNeg imp = {s = (PhrUtt NoPConj (UttImpSg PNeg imp) NoVoc).s ++ "!"} ;
+    PhrPos = mkPhr ;
+    PhrNeg sent = mkPhr (mkS negativePol sent) ;
+    PhrQuest sent = mkPhr (mkQS sent) ;
+    PhrIAdv iadv sent = mkPhr (mkQS (mkQCl iadv sent)) ; 
+    PhrImp = mkPhr ;
+    PhrImpNeg imp = mkPhr (mkUtt negativePol imp) ;
     
-    SentV  v np = mkSent np (UseV v) ;
-
-    SentV2 v x y = mkSent x (ComplSlash (SlashV2a v) y) ;
-    SentV2Mass v x y = mkSent x (ComplSlash (SlashV2a v) (massNP y)) ;
-    SentV3 v x y z = mkSent x (ComplSlash (Slash2V3 v y) z) ;
-    SentA  a x = mkSent x (UseComp (CompAP (PositA a))) ;
-    SentNP a x = mkSent x (UseComp (CompNP a)) ;
-
-    SentAdvV  v np adv = mkSent np (AdvVP (UseV v) adv) ;
-    SentAdvV2 v x y adv = mkSent x (AdvVP (ComplSlash (SlashV2a v) y) adv) ;
-
-    ImpV v = ImpVP (UseV v) ;
-    ImpV2 v x = ImpVP (ComplSlash (SlashV2a v) x)  ;
-
-    UsePron p = Lang.UsePron p ;
-    DetCN d n = Lang.DetCN d n ;
-    NumCN k cn = Lang.DetCN (DetArtCard (IndefArt) k) cn ;
-
-    UseN n = Lang.UseN n ;
-    ModCN a cn = AdjCN (PositA a) cn ;
-
-    UseMassN mn = Lang.UseN mn ;
-    ModMass a cn = AdjCN (PositA a) cn ;
-
-  param
-    SForm = SPos | SNeg | SQuest ;
-
-  oper
-    mkSent : NP -> VP -> Sent ;
-    mkSent np vp = 
-      let cl = PredVP np vp
-      in {
-        s = table {
-          SPos   => Predef.toStr S  (UseCl Lang.TPres ASimul PPos cl) ;
-          SNeg   => Predef.toStr S  (UseCl Lang.TPres ASimul PNeg cl) ;
-          SQuest => Predef.toStr QS (UseQCl Lang.TPres ASimul PPos (QuestCl cl))
-          } ;
-        lock_Sent = <>
-      } ;
-
-    massNP : CN -> NP = MassNP ;
+    SentV v x = mkCl x v ;
+
+    SentV2 v x y = mkCl x v y ;
+    SentV2Mass v x y = mkCl x v (mkNP y) ;
+    SentV3 v x y z = mkCl x v y z ;
+    SentA  a x = mkCl x a ;
+    SentNP a x = mkCl x a ;
+
+    SentAdvV  v np adv = mkCl np (mkVP (mkVP v) adv) ;
+    SentAdvV2 v x y adv = mkCl x (mkVP (mkVP v y) adv) ;
+
+    ImpV = mkImp ;
+    ImpV2 = mkImp ;
+
+    DetCN = mkNP ;
+    NumCN = mkNP ;
+
+    UseN = mkCN ;
+    ModCN = mkCN ;
+
+    UseMassN = mkCN ;
+    ModMass = mkCN ;
+
+    DefCN = mkNP the_Art ;
+    IndefCN = mkNP a_Art ;
+    PrepNP = mkAdv ;
+    on_Prep = Syntax.on_Prep ;
 
 }
diff --git a/examples/bronzeage/BronzeageIta.gf b/examples/bronzeage/BronzeageIta.gf
new file mode 100644
index 000000000..7f40ebb31
--- /dev/null
+++ b/examples/bronzeage/BronzeageIta.gf
@@ -0,0 +1,7 @@
+--# -path=.:present
+
+concrete BronzeageIta of Bronzeage = SwadeshIta ** BronzeageI with
+  (Syntax = SyntaxIta) ** open ResIta in {
+  flags language = en_US;
+}
+
diff --git a/examples/bronzeage/BronzeageRus.gf b/examples/bronzeage/BronzeageRus.gf
index 916c78e38..c611133ef 100644
--- a/examples/bronzeage/BronzeageRus.gf
+++ b/examples/bronzeage/BronzeageRus.gf
@@ -1,7 +1,7 @@
---# -path=.:present:prelude
+--# -path=.:present
 
-concrete BronzeageRus of Bronzeage = CatRus, SwadeshRus ** BronzeageI with
-  (Lang = LangRus) ** {
+concrete BronzeageRus of Bronzeage = SwadeshRus ** BronzeageI with
+  (Syntax = SyntaxRus) ** open ResRus in {
   flags language = ru_RU;
 }
 
diff --git a/examples/bronzeage/BronzeageSwe.gf b/examples/bronzeage/BronzeageSwe.gf
index 24a4cf759..bb726005d 100644
--- a/examples/bronzeage/BronzeageSwe.gf
+++ b/examples/bronzeage/BronzeageSwe.gf
@@ -1,7 +1,7 @@
---# -path=.:present:prelude
+--# -path=.:present
 
-concrete BronzeageSwe of Bronzeage = CatSwe, SwadeshSwe **  BronzeageI with
-  (Lang = LangSwe) ** {
+concrete BronzeageSwe of Bronzeage = SwadeshSwe **  BronzeageI with
+  (Syntax = SyntaxSwe) ** open ResSwe in {
   flags language = sv_SE;
 }
 
diff --git a/examples/bronzeage/Makefile b/examples/bronzeage/Makefile
new file mode 100644
index 000000000..ea8e5937f
--- /dev/null
+++ b/examples/bronzeage/Makefile
@@ -0,0 +1,9 @@
+# notice: GF_LIB_PATH has to point to GF/next-lib
+
+all: magnet
+
+magnet:
+	gfc --make -src --parser=off --name=fin BronzeageFin.gf
+	gfc --make -src BronzeageEng.gf BronzeageSwe.gf BronzeageIta.gf
+	gfc --make --name=grammar fin.pgf Bronzeage.pgf
+
diff --git a/examples/bronzeage/Swadesh.gf b/examples/bronzeage/Swadesh.gf
index 816c3a6b1..2f0ad7e93 100644
--- a/examples/bronzeage/Swadesh.gf
+++ b/examples/bronzeage/Swadesh.gf
@@ -1,18 +1,34 @@
-abstract Swadesh = Cat ** {
+abstract Swadesh = {
 
   cat
+    V ;
+    V2 ;
+    V3 ;
+    A ;
+    N ;
+    Pron ;
+    Det ;
+    Card ;
+    Prep ;
+    IAdv ;
+    IP ;
+    NP ;
+    Adv ; 
+    Conj ;
+    Ord ;
+
     MassN ;
 
   fun
 
     -- Pronouns
 
-    i_NP : Pron ;
-    youSg_NP : Pron ;
-    he_NP : Pron ;
-    we_NP : Pron ;
-    youPl_NP : Pron ;
-    they_NP : Pron ;
+    i_NP : NP ;
+    youSg_NP : NP ;
+    he_NP : NP ;
+    we_NP : NP ;
+    youPl_NP : NP ;
+    they_NP : NP ;
     whoPl_IP : IP ; -- only one who in Swadesh 207
     whoSg_IP : IP ;
     whatPl_IP : IP ; -- only one what in Swadesh 207
diff --git a/examples/bronzeage/SwadeshEng.gf b/examples/bronzeage/SwadeshEng.gf
index 5b10141c5..a3db1bc9a 100644
--- a/examples/bronzeage/SwadeshEng.gf
+++ b/examples/bronzeage/SwadeshEng.gf
@@ -1,5 +1,7 @@
 --# -path=.:present:prelude
 
-concrete SwadeshEng of Swadesh = CatEng ** SwadeshI with
-  (Lang = LangEng) ;
+concrete SwadeshEng of Swadesh = SwadeshI with
+  (Syntax = SyntaxEng),
+  (L = LexiconEng),
+  (Lexicon = LexiconEng) ;
 
diff --git a/examples/bronzeage/SwadeshFin.gf b/examples/bronzeage/SwadeshFin.gf
index 191874c05..8c05ca529 100644
--- a/examples/bronzeage/SwadeshFin.gf
+++ b/examples/bronzeage/SwadeshFin.gf
@@ -1,5 +1,8 @@
 --# -path=.:present:prelude
 
-concrete SwadeshFin of Swadesh = CatFin ** SwadeshI with
-  (Lang = LangFin) ;
+concrete SwadeshFin of Swadesh = SwadeshI with
+  (L = LexiconFin),
+  (Lexicon = LexiconFin),
+  (Syntax = SyntaxFin) ;
+
 
diff --git a/examples/bronzeage/SwadeshFre.gf b/examples/bronzeage/SwadeshFre.gf
index bffe9e36e..16c069944 100644
--- a/examples/bronzeage/SwadeshFre.gf
+++ b/examples/bronzeage/SwadeshFre.gf
@@ -1,5 +1,7 @@
---# -path=.:present:prelude
+--# -path=.:present
 
-concrete SwadeshFre of Swadesh = CatFre ** SwadeshI with
-  (Lang = LangFre) ;
+concrete SwadeshFre of Swadesh = SwadeshI with
+  (L = LexiconFre),
+  (Lexicon = LexiconFre),
+  (Syntax = SyntaxFre) ;
 
diff --git a/examples/bronzeage/SwadeshI.gf b/examples/bronzeage/SwadeshI.gf
index 1825502cd..f060cf4bf 100644
--- a/examples/bronzeage/SwadeshI.gf
+++ b/examples/bronzeage/SwadeshI.gf
@@ -1,226 +1,243 @@
-incomplete concrete SwadeshI of Swadesh = open Lang in {
+incomplete concrete SwadeshI of Swadesh = open Syntax, (L = Lexicon) in {
 
   lincat
-    MassN = Lang.N ;
+    V = Syntax.V ;
+    V2 = Syntax.V2 ;
+    V3 = Syntax.V3 ;
+    A = Syntax.A ;
+    N = Syntax.N ;
+    Pron = Syntax.Pron ;
+    Det = Syntax.Det ;
+    Card = Syntax.Card ;
+    Prep = Syntax.Prep ;
+    IAdv = Syntax.IAdv ;
+    IP = Syntax.IP ;
+    NP = Syntax.NP ;
+    Adv = Syntax.Adv ;
+    Conj = Syntax.Conj ;
+    Ord = Syntax.Ord ;
+
+    MassN = Syntax.N ;
 
   lin
 
     -- Pronouns
 
-    i_NP = Lang.i_Pron ;
-    youSg_NP = Lang.youSg_Pron ;
-    he_NP = Lang.he_Pron ;
-    we_NP = Lang.we_Pron ;
-    youPl_NP = Lang.youPl_Pron ;
-    they_NP = Lang.they_Pron ;
-    whoPl_IP = Lang.whoPl_IP ;
-    whoSg_IP = Lang.whoSg_IP ;
-    whatPl_IP = Lang.whatPl_IP ;
-    whatSg_IP = Lang.whatSg_IP ;
+    i_NP = mkNP i_Pron ;
+    youSg_NP = mkNP youSg_Pron ;
+    he_NP = mkNP he_Pron ;
+    we_NP = mkNP we_Pron ;
+    youPl_NP = mkNP youPl_Pron ;
+    they_NP = mkNP they_Pron ;
+    whoPl_IP = whoPl_IP ;
+    whoSg_IP = whoSg_IP ;
+    whatPl_IP = whatPl_IP ;
+    whatSg_IP = whatSg_IP ;
 
     -- Determiners
 
-    this_Det = DetQuant (this_Quant) NumSg ;
-    that_Det = DetQuant (that_Quant) NumSg ;
-    many_Det = Lang.many_Det ;
+    this_Det = mkDet this_Quant ;
+    that_Det = mkDet that_Quant ;
+    many_Det = many_Det ;
     some_Det = someSg_Det ;
 ----    few_Det =  few_Det ;
 
-   left_Ord = Lang.left_Ord ;
-   right_Ord = Lang.right_Ord ;
+--   left_Ord = Syntax.left_Ord ;
+--   right_Ord = Syntax.right_Ord ;
     -- Adverbs
-    here_Adv = Lang.here_Adv;
-    there_Adv = Lang.there_Adv;
-    where_IAdv = Lang.where_IAdv;
-    when_IAdv = Lang.when_IAdv;
-    how_IAdv = Lang.how_IAdv;
-   far_Adv = Lang.far_Adv ;
+    here_Adv = Syntax.here_Adv;
+    there_Adv = Syntax.there_Adv;
+    where_IAdv = Syntax.where_IAdv;
+    when_IAdv = Syntax.when_IAdv;
+    how_IAdv = Syntax.how_IAdv;
+    far_Adv = L.far_Adv ;
     -- not : Adv ; -- ?
     -- Conjunctions
-    and_Conj = Lang.and_Conj ;
+    and_Conj = and_Conj ;
     -- Prepositions
-    in_Prep = Lang.in_Prep ;
-    with_Prep = Lang.with_Prep ;
+    in_Prep = Syntax.in_Prep ;
+    with_Prep = Syntax.with_Prep ;
     -- Numerals
-    one_Det = Lang.NumNumeral (num (pot2as3 (pot1as2 (pot0as1 pot01)))) ;
-    two_Num = Lang.NumNumeral (num (pot2as3 (pot1as2 (pot0as1 (pot0 n2))))) ;
-    three_Num = Lang.NumNumeral (num (pot2as3 (pot1as2 (pot0as1 (pot0 n3))))) ;
-    four_Num = Lang.NumNumeral (num (pot2as3 (pot1as2 (pot0as1 (pot0 n4))))) ;
-    five_Num = Lang.NumNumeral (num (pot2as3 (pot1as2 (pot0as1 (pot0 n5))))) ;
+    one_Det = mkCard n1_Numeral ;
+    two_Num = mkCard n2_Numeral ;
+    three_Num = mkCard n3_Numeral ;
+    four_Num = mkCard n4_Numeral ;
+    five_Num = mkCard n5_Numeral ;
+
     -- Adjectives
-    bad_A = Lang.bad_A ;
-    big_A = Lang.big_A ;
-    black_A = Lang.black_A ;
-    cold_A = Lang.cold_A ;
-   correct_A = Lang.correct_A ;
-    dirty_A = Lang.dirty_A ;
-   dry_A = Lang.dry_A ;
-   dull_A = Lang.dull_A ;
-   full_A = Lang.full_A ;
-    good_A = Lang.good_A ;
-    green_A = Lang.green_A ;
-   heavy_A = Lang.heavy_A ;
-    long_A = Lang.long_A ;
-    narrow_A = Lang.narrow_A ;
-   near_A = Lang.near_A ;
-    new_A = Lang.new_A ;
-    old_A = Lang.old_A ;
----- other_A = Lang.other_A ;
-    red_A = Lang.red_A ;
-   rotten_A = Lang.rotten_A ;
-   round_A = Lang.round_A ;
-   sharp_A = Lang.sharp_A ;
-    short_A = Lang.short_A ;
-    small_A = Lang.small_A ;
-   smooth_A = Lang.smooth_A ;
-   straight_A = Lang.straight_A ;
-    thick_A = Lang.thick_A ;
-    thin_A = Lang.thin_A ;
-    warm_A = Lang.warm_A ;
-   wet_A = Lang.wet_A ;
-    white_A = Lang.white_A ;
-   wide_A = Lang.wide_A ;
-    yellow_A = Lang.yellow_A ;
+    bad_A = L.bad_A ;
+    big_A = L.big_A ;
+    black_A = L.black_A ;
+    cold_A = L.cold_A ;
+   correct_A = L.correct_A ;
+    dirty_A = L.dirty_A ;
+   dry_A = L.dry_A ;
+   dull_A = L.dull_A ;
+   full_A = L.full_A ;
+    good_A = L.good_A ;
+    green_A = L.green_A ;
+   heavy_A = L.heavy_A ;
+    long_A = L.long_A ;
+    narrow_A = L.narrow_A ;
+   near_A = L.near_A ;
+    new_A = L.new_A ;
+    old_A = L.old_A ;
+---- other_A = L.other_A ;
+    red_A = L.red_A ;
+   rotten_A = L.rotten_A ;
+   round_A = L.round_A ;
+   sharp_A = L.sharp_A ;
+    short_A = L.short_A ;
+    small_A = L.small_A ;
+   smooth_A = L.smooth_A ;
+   straight_A = L.straight_A ;
+    thick_A = L.thick_A ;
+    thin_A = L.thin_A ;
+    warm_A = L.warm_A ;
+   wet_A = L.wet_A ;
+    white_A = L.white_A ;
+   wide_A = L.wide_A ;
+    yellow_A = L.yellow_A ;
     -- Nouns
-   animal_N = Lang.animal_N ;
-   ashes_N = Lang.ashes_N ;
-   back_N = Lang.back_N ;
-   bark_N = Lang.bark_N ;
-   belly_N = Lang.belly_N ;
-    bird_N = Lang.bird_N;
-   blood_N = Lang.blood_N ;
-   bone_N = Lang.bone_N ;
-   breast_N = Lang.breast_N ;
-    child_N = Lang.child_N ;
-   cloud_N = Lang.cloud_N ;
-   day_N = Lang.day_N ;
-    dog_N = Lang.dog_N ;
-   dust_N = Lang.dust_N ;
-   ear_N = Lang.ear_N ;
-   earth_N = Lang.earth_N ;
-   egg_N = Lang.egg_N ;
-   eye_N = Lang.eye_N ;
-   fat_N = Lang.fat_N ;
-   feather_N = Lang.feather_N ;
-   fingernail_N = Lang.fingernail_N ;
-   fire_N = Lang.fire_N ;
-    fish_N = Lang.fish_N ;
-   flower_N = Lang.flower_N ;
-   fog_N = Lang.fog_N ;
-   foot_N = Lang.foot_N ;
-   forest_N = Lang.forest_N ;
-    fruit_N = Lang.fruit_N ;
-   grass_N = Lang.grass_N ;
-   guts_N = Lang.guts_N ;
-   hair_N = Lang.hair_N ;
-   hand_N = Lang.hand_N ;
-   head_N = Lang.head_N ;
-   heart_N = Lang.heart_N ;
-   horn_N = Lang.horn_N ;
-    husband_N = Lang.man_N ; --- aviomies
-   ice_N = Lang.ice_N ;
-   knee_N = Lang.knee_N ;
-    lake_N = Lang.lake_N ;
-   leaf_N = Lang.leaf_N ;
-   leg_N = Lang.leg_N ;
-   liver_N = Lang.liver_N ;
-   louse_N = Lang.louse_N ;
-    man_N = Lang.man_N ;
-    meat_N = Lang.meat_N ;
-    moon_N = Lang.moon_N ;
-----   mother_N = Lang.mother_N ;
-    mountain_N = Lang.mountain_N ;
-   mouth_N = Lang.mouth_N ;
-   name_N = Lang.name_N ;
-   neck_N = Lang.neck_N ;
-   night_N = Lang.night_N ;
-   nose_N = Lang.nose_N ;
-   person_N = Lang.person_N ;
-   rain_N = Lang.rain_N ;
-    river_N = Lang.river_N ;
-   road_N = Lang.road_N ;
-   root_N = Lang.root_N ;
-   rope_N = Lang.rope_N ;
-   salt_N = Lang.salt_N ;
-   sand_N = Lang.sand_N ;
-    sea_N = Lang.sea_N ;
-   seed_N = Lang.seed_N ;
-   skin_N = Lang.skin_N ;
-   sky_N = Lang.sky_N ;
-   smoke_N = Lang.smoke_N ;
-    snake_N = Lang.snake_N ;
-   snow_N = Lang.snow_N ;
-    star_N = Lang.star_N ;
-   stick_N = Lang.stick_N ;
-    stone_N = Lang.stone_N ;
-    sun_N = Lang.sun_N ;
-   tail_N = Lang.tail_N ;
-   tongue_N = Lang.tongue_N ;
-   tooth_N = Lang.tooth_N ;
-    tree_N = Lang.tree_N ;
-    water_N = Lang.water_N ;
-   wife_N = Lang.wife_N ;
-   wind_N = Lang.wind_N ;
-   wing_N = Lang.wing_N ;
-    woman_N = Lang.woman_N ;
-   worm_N = Lang.worm_N ;
-   year_N = Lang.year_N ;
+   animal_N = L.animal_N ;
+   ashes_N = L.ashes_N ;
+   back_N = L.back_N ;
+   bark_N = L.bark_N ;
+   belly_N = L.belly_N ;
+    bird_N = L.bird_N;
+   blood_N = L.blood_N ;
+   bone_N = L.bone_N ;
+   breast_N = L.breast_N ;
+    child_N = L.child_N ;
+   cloud_N = L.cloud_N ;
+   day_N = L.day_N ;
+    dog_N = L.dog_N ;
+   dust_N = L.dust_N ;
+   ear_N = L.ear_N ;
+   earth_N = L.earth_N ;
+   egg_N = L.egg_N ;
+   eye_N = L.eye_N ;
+   fat_N = L.fat_N ;
+   feather_N = L.feather_N ;
+   fingernail_N = L.fingernail_N ;
+   fire_N = L.fire_N ;
+    fish_N = L.fish_N ;
+   flower_N = L.flower_N ;
+   fog_N = L.fog_N ;
+   foot_N = L.foot_N ;
+   forest_N = L.forest_N ;
+    fruit_N = L.fruit_N ;
+   grass_N = L.grass_N ;
+   guts_N = L.guts_N ;
+   hair_N = L.hair_N ;
+   hand_N = L.hand_N ;
+   head_N = L.head_N ;
+   heart_N = L.heart_N ;
+   horn_N = L.horn_N ;
+    husband_N = L.man_N ; --- aviomies
+   ice_N = L.ice_N ;
+   knee_N = L.knee_N ;
+    lake_N = L.lake_N ;
+   leaf_N = L.leaf_N ;
+   leg_N = L.leg_N ;
+   liver_N = L.liver_N ;
+   louse_N = L.louse_N ;
+    man_N = L.man_N ;
+    meat_N = L.meat_N ;
+    moon_N = L.moon_N ;
+----   mother_N = L.mother_N ;
+    mountain_N = L.mountain_N ;
+   mouth_N = L.mouth_N ;
+   name_N = L.name_N ;
+   neck_N = L.neck_N ;
+   night_N = L.night_N ;
+   nose_N = L.nose_N ;
+   person_N = L.person_N ;
+   rain_N = L.rain_N ;
+    river_N = L.river_N ;
+   road_N = L.road_N ;
+   root_N = L.root_N ;
+   rope_N = L.rope_N ;
+   salt_N = L.salt_N ;
+   sand_N = L.sand_N ;
+    sea_N = L.sea_N ;
+   seed_N = L.seed_N ;
+   skin_N = L.skin_N ;
+   sky_N = L.sky_N ;
+   smoke_N = L.smoke_N ;
+    snake_N = L.snake_N ;
+   snow_N = L.snow_N ;
+    star_N = L.star_N ;
+   stick_N = L.stick_N ;
+    stone_N = L.stone_N ;
+    sun_N = L.sun_N ;
+   tail_N = L.tail_N ;
+   tongue_N = L.tongue_N ;
+   tooth_N = L.tooth_N ;
+    tree_N = L.tree_N ;
+    water_N = L.water_N ;
+   wife_N = L.wife_N ;
+   wind_N = L.wind_N ;
+   wing_N = L.wing_N ;
+    woman_N = L.woman_N ;
+   worm_N = L.worm_N ;
+   year_N = L.year_N ;
     -- Verbs
-   bite_V2 = Lang.bite_V2 ;
-   blow_V = Lang.blow_V ;
-   breathe_V = Lang.breathe_V ;
-   burn_V = Lang.burn_V ;
-    come_V = Lang.come_V ;
-   count_V2 = Lang.count_V2 ;
-   cut_V2 = Lang.cut_V2 ;
-   die_V = Lang.die_V ;
-   dig_V = Lang.dig_V ;
-   drink_V2 = Lang.drink_V2 ;
-   eat_V2 = Lang.eat_V2 ;
-   fall_V = Lang.fall_V ;
-   fear_V2 = Lang.fear_V2 ;
-   fight_V2 = Lang.fight_V2 ;
-   float_V = Lang.float_V ;
-   flow_V = Lang.flow_V ;
-   fly_V = Lang.fly_V ;
-   freeze_V = Lang.freeze_V ;
-   give_V3 = Lang.give_V3 ;
-   hear_V2 = Lang.hear_V2 ;
-   hit_V2 = Lang.hit_V2 ;
-   hold_V2 = Lang.hold_V2 ;
-   hunt_V2 = Lang.hunt_V2 ;
-   kill_V2 = Lang.kill_V2 ;
-   know_V2 = Lang.know_V2 ;
-   laugh_V = Lang.laugh_V ;
-   lie_V = Lang.lie_V ;
-    live_V = Lang.live_V ;
-    play_V = Lang. play_V2 ;
-   pull_V2 = Lang.pull_V2 ;
-   push_V2 = Lang.push_V2 ;
-   rub_V2 = Lang.rub_V2 ;
-   say_V = Lang.say_VS ;
-   scratch_V2 = Lang.scratch_V2 ;
-    see_V2 = Lang.see_V2 ;
-   sew_V = Lang.sew_V ;
-   sing_V = Lang.sing_V ;
-   sit_V = Lang.sit_V ;
-    sleep_V = Lang.sleep_V ;
-   smell_V = Lang.smell_V ;
-   spit_V = Lang.spit_V ;
-   split_V2 = Lang.split_V2 ;
-   squeeze_V2 = Lang.squeeze_V2 ;
-   stab_V2 = Lang.stab_V2 ;
-   stand_V = Lang.stand_V ;
-   suck_V2 = Lang.suck_V2 ;
-   swell_V = Lang.swell_V ;
-   swim_V = Lang.swim_V ;
-   think_V = Lang.think_V ;
-   throw_V2 = Lang.throw_V2 ;
-   tie_V2 = Lang.tie_V2 ;
-   turn_V = Lang.turn_V ;
-   vomit_V = Lang.vomit_V ;
-    walk_V = Lang.walk_V ;
-   wash_V2 = Lang.wash_V2 ;
-   wipe_V2 = Lang.wipe_V2 ;
+   bite_V2 = L.bite_V2 ;
+   blow_V = L.blow_V ;
+   breathe_V = L.breathe_V ;
+   burn_V = L.burn_V ;
+    come_V = L.come_V ;
+   count_V2 = L.count_V2 ;
+   cut_V2 = L.cut_V2 ;
+   die_V = L.die_V ;
+   dig_V = L.dig_V ;
+   drink_V2 = L.drink_V2 ;
+   eat_V2 = L.eat_V2 ;
+   fall_V = L.fall_V ;
+   fear_V2 = L.fear_V2 ;
+   fight_V2 = L.fight_V2 ;
+   float_V = L.float_V ;
+   flow_V = L.flow_V ;
+   fly_V = L.fly_V ;
+   freeze_V = L.freeze_V ;
+   give_V3 = L.give_V3 ;
+   hear_V2 = L.hear_V2 ;
+   hit_V2 = L.hit_V2 ;
+   hold_V2 = L.hold_V2 ;
+   hunt_V2 = L.hunt_V2 ;
+   kill_V2 = L.kill_V2 ;
+   know_V2 = L.know_V2 ;
+   laugh_V = L.laugh_V ;
+   lie_V = L.lie_V ;
+    live_V = L.live_V ;
+--    play_V = L. play_V2 ;
+   pull_V2 = L.pull_V2 ;
+   push_V2 = L.push_V2 ;
+   rub_V2 = L.rub_V2 ;
+--   say_V = L.say_VS ;
+   scratch_V2 = L.scratch_V2 ;
+    see_V2 = L.see_V2 ;
+   sew_V = L.sew_V ;
+   sing_V = L.sing_V ;
+   sit_V = L.sit_V ;
+    sleep_V = L.sleep_V ;
+   smell_V = L.smell_V ;
+   spit_V = L.spit_V ;
+   split_V2 = L.split_V2 ;
+   squeeze_V2 = L.squeeze_V2 ;
+   stab_V2 = L.stab_V2 ;
+   stand_V = L.stand_V ;
+   suck_V2 = L.suck_V2 ;
+   swell_V = L.swell_V ;
+   swim_V = L.swim_V ;
+   think_V = L.think_V ;
+   throw_V2 = L.throw_V2 ;
+   tie_V2 = L.tie_V2 ;
+   turn_V = L.turn_V ;
+   vomit_V = L.vomit_V ;
+    walk_V = L.walk_V ;
+   wash_V2 = L.wash_V2 ;
+   wipe_V2 = L.wipe_V2 ;
 
 }
diff --git a/examples/bronzeage/SwadeshIta.gf b/examples/bronzeage/SwadeshIta.gf
index b84295867..eef7f2dd1 100644
--- a/examples/bronzeage/SwadeshIta.gf
+++ b/examples/bronzeage/SwadeshIta.gf
@@ -1,5 +1,8 @@
 --# -path=.:present:prelude
 
-concrete SwadeshIta of Swadesh = CatIta ** SwadeshI with
-  (Lang = LangIta) ;
+concrete SwadeshIta of Swadesh = SwadeshI with
+  (L = LexiconIta),
+  (Lexicon = LexiconIta),
+  (Syntax = SyntaxIta) ;
+
 
diff --git a/examples/bronzeage/SwadeshRus.gf b/examples/bronzeage/SwadeshRus.gf
index 263819f07..54439b095 100644
--- a/examples/bronzeage/SwadeshRus.gf
+++ b/examples/bronzeage/SwadeshRus.gf
@@ -1,5 +1,6 @@
---# -path=.:present:prelude
-
-concrete SwadeshRus of Swadesh = CatRus ** SwadeshI with
-  (Lang = LangRus) ;
+--# -path=.:present
 
+concrete SwadeshRus of Swadesh = SwadeshI with
+  (L = LexiconRus),
+  (Lexicon = LexiconRus),
+  (Syntax = SyntaxRus) ;
diff --git a/examples/bronzeage/SwadeshSwe.gf b/examples/bronzeage/SwadeshSwe.gf
index 2a82b2bc4..58c870430 100644
--- a/examples/bronzeage/SwadeshSwe.gf
+++ b/examples/bronzeage/SwadeshSwe.gf
@@ -1,5 +1,7 @@
---# -path=.:present:prelude
+--# -path=.:present
 
-concrete SwadeshSwe of Swadesh = CatSwe ** SwadeshI with
-  (Lang = LangSwe) ;
+concrete SwadeshSwe of Swadesh = SwadeshI with
+  (L = LexiconSwe),
+  (Lexicon = LexiconSwe),
+  (Syntax = SyntaxSwe) ;