From d907e644cd7289607f04937a8a65f1ccb55da5ca Mon Sep 17 00:00:00 2001
From: aarne <aarne@cs.chalmers.se>
Date: Thu, 6 Nov 2008 09:55:36 +0000
Subject: [PATCH] German Bronzeage ; two fixes in Italian

---
 examples/bronzeage/BronzeageGer.gf  | 6 +++---
 examples/bronzeage/Makefile         | 4 +++-
 examples/bronzeage/SwadeshGer.gf    | 9 +++++----
 next-lib/src/italian/LexiconIta.gf  | 2 +-
 next-lib/src/romance/NounRomance.gf | 2 +-
 5 files changed, 13 insertions(+), 10 deletions(-)

diff --git a/examples/bronzeage/BronzeageGer.gf b/examples/bronzeage/BronzeageGer.gf
index dec77d187..4b3377182 100644
--- a/examples/bronzeage/BronzeageGer.gf
+++ b/examples/bronzeage/BronzeageGer.gf
@@ -1,7 +1,7 @@
---# -path=.:present:prelude
+--# -path=.:present
 
-concrete BronzeageGer of Bronzeage = CatGer, SwadeshGer **  BronzeageI with
-  (Lang = LangGer) ** {
+concrete BronzeageGer of Bronzeage = SwadeshGer **  BronzeageI with
+  (Syntax = SyntaxGer) ** open ResGer in {
   flags language = de_DE;
 }
 
diff --git a/examples/bronzeage/Makefile b/examples/bronzeage/Makefile
index ea8e5937f..3f7465720 100644
--- a/examples/bronzeage/Makefile
+++ b/examples/bronzeage/Makefile
@@ -3,7 +3,9 @@
 all: magnet
 
 magnet:
+#	gfc --make -src --parser=off --name=fre BronzeageFre.gf +RTS -K100M
 	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 Bronzeage.pgf
+	gfc --make --name=grammar fin.pgf ger.pgf Bronzeage.pgf
 
diff --git a/examples/bronzeage/SwadeshGer.gf b/examples/bronzeage/SwadeshGer.gf
index 096d3496c..49b76fd03 100644
--- a/examples/bronzeage/SwadeshGer.gf
+++ b/examples/bronzeage/SwadeshGer.gf
@@ -1,5 +1,6 @@
---# -path=.:present:prelude
-
-concrete SwadeshGer of Swadesh = CatGer ** SwadeshI with
-  (Lang = LangGer) ;
+--# -path=.:present
 
+concrete SwadeshGer of Swadesh = SwadeshI with
+  (L = LexiconGer),
+  (Lexicon = LexiconGer),
+  (Syntax = SyntaxGer) ;
diff --git a/next-lib/src/italian/LexiconIta.gf b/next-lib/src/italian/LexiconIta.gf
index 573c436e6..20cf35fbd 100644
--- a/next-lib/src/italian/LexiconIta.gf
+++ b/next-lib/src/italian/LexiconIta.gf
@@ -73,7 +73,7 @@ lin
   father_N2 = diN2 (regN "padre") ;
   fear_VS = mkVS (verboV (temere_20 "temere")) ;
   find_V2 = dirV2 (regV "trovare") ;
-  fish_N = regN "pesca" ;
+  fish_N = regN "pesce" ;
   floor_N = regN "pavimento" ;
   forget_V2 = dirV2 (regV "dimenticare") ;
   fridge_N = regN "frigorifero" ;
diff --git a/next-lib/src/romance/NounRomance.gf b/next-lib/src/romance/NounRomance.gf
index 8bf8651ab..3bc39aba8 100644
--- a/next-lib/src/romance/NounRomance.gf
+++ b/next-lib/src/romance/NounRomance.gf
@@ -97,7 +97,7 @@ incomplete concrete NounRomance of Noun =
       } ;
 
     IndefArt = {
-      s = \\b,n,g,c => if_then_Str b [] (artIndef g n c) ;
+      s = \\b,n,g,c => if_then_Str b (prepCase c) (artIndef g n c) ;
       sp = \\n,g,c => artIndef g n c ; ---- not for Fre
       s2 = []
       } ;