bug fixes relevant for Bronzeage. NB Bulgarian can be compiled separately with old lib

6 files changed, 22 insertions, 14 deletions

diff --git a/examples/bronzeage/BronzeageNor.gf b/examples/bronzeage/BronzeageNor.gf
index 75b469cee..e0d4c6af3 100644
--- a/examples/bronzeage/BronzeageNor.gf
+++ b/examples/bronzeage/BronzeageNor.gf
@@ -1,6 +1,6 @@
 --# -path=.:present:prelude
 
-concrete BronzeageNor of Bronzeage = CatNor, SwadeshNor **  BronzeageI with
-  (Lang = LangNor) ** {
+concrete BronzeageNor of Bronzeage = SwadeshNor **  BronzeageI with
+  (Syntax = SyntaxNor) ** open ResNor in {
   flags language = nb_NO;
 }
diff --git a/examples/bronzeage/BronzeageSpa.gf b/examples/bronzeage/BronzeageSpa.gf
index db10f2885..c372ee224 100644
--- a/examples/bronzeage/BronzeageSpa.gf
+++ b/examples/bronzeage/BronzeageSpa.gf
@@ -1,7 +1,7 @@
 --# -path=.:present:prelude
 
-concrete BronzeageSpa of Bronzeage = CatSpa, SwadeshSpa **  BronzeageI with
-  (Lang = LangSpa) ** {
+concrete BronzeageSpa of Bronzeage = SwadeshSpa **  BronzeageI with
+  (Syntax = SyntaxSpa) ** open ResSpa in {
   flags language = es_ES;
 }
 
diff --git a/examples/bronzeage/Makefile b/examples/bronzeage/Makefile
index bdc3e035f..b694683d3 100644
--- a/examples/bronzeage/Makefile
+++ b/examples/bronzeage/Makefile
@@ -6,7 +6,9 @@ magnet:
 #	gfc --make -src --parser=off --name=fre BronzeageFre.gf +RTS -K100M
 #	gfc --make -src --erasing=on --name=bul BronzeageBul.gf
 	gfc --make -src --parser=off --name=fin BronzeageFin.gf
-	gfc --make -src --erasing=on --name=ger BronzeageGer.gf
-	gfc --make -src BronzeageEng.gf BronzeageSwe.gf BronzeageIta.gf
-	gfc --make --name=grammar fin.pgf ger.pgf Bronzeage.pgf
+	gfc --make -src --erasing=on --name=eng BronzeageEng.gf
+	gfc --make -src --erasing=on --name=ger BronzeageGer.gf 
+	gfc --make -src --erasing=on --name=scand BronzeageNor.gf BronzeageSwe.gf 
+	gfc --make -src --name=rom BronzeageIta.gf BronzeageSpa.gf
+	gfc --make --name=bronze eng.pgf fin.pgf ger.pgf rom.pgf scand.pgf 
 
diff --git a/examples/bronzeage/SwadeshNor.gf b/examples/bronzeage/SwadeshNor.gf
index 5d392462d..f75254265 100644
--- a/examples/bronzeage/SwadeshNor.gf
+++ b/examples/bronzeage/SwadeshNor.gf
@@ -1,5 +1,8 @@
---# -path=.:present:prelude
+--# -path=.:present
+
+concrete SwadeshNor of Swadesh = SwadeshI with
+  (L = LexiconNor),
+  (Lexicon = LexiconNor),
+  (Syntax = SyntaxNor) ;
 
-concrete SwadeshNor of Swadesh = CatNor ** SwadeshI with
-  (Lang = LangNor) ;
 
diff --git a/examples/bronzeage/SwadeshSpa.gf b/examples/bronzeage/SwadeshSpa.gf
index 48de83341..8dbbfa6a5 100644
--- a/examples/bronzeage/SwadeshSpa.gf
+++ b/examples/bronzeage/SwadeshSpa.gf
@@ -1,5 +1,8 @@
---# -path=.:present:prelude
+--# -path=.:present
+
+concrete SwadeshSpa of Swadesh = SwadeshI with
+  (L = LexiconSpa),
+  (Lexicon = LexiconSpa),
+  (Syntax = SyntaxSpa) ;
 
-concrete SwadeshSpa of Swadesh = CatSpa ** SwadeshI with
-  (Lang = LangSpa) ;
 
diff --git a/next-lib/src/spanish/NumeralSpa.gf b/next-lib/src/spanish/NumeralSpa.gf
index 7775c105b..7a3dda29b 100644
--- a/next-lib/src/spanish/NumeralSpa.gf
+++ b/next-lib/src/spanish/NumeralSpa.gf
@@ -45,7 +45,7 @@ lin pot01 =
      <hundra True,  NCard Fem> => "ciento" ;
      _ => uno ! f ! g
      } ; 
-   n = Pl
+   n = Sg
    } ;
 
 lin pot0 d = {s = d.s ; n = Pl} ;