From 4da567769784984dbc06d31340d5fafe8c7244da Mon Sep 17 00:00:00 2001
From: Aarne Ranta <aarne@chalmers.se>
Date: Wed, 25 Oct 2017 11:09:13 +0200
Subject: [PATCH] some fixes in German

---
 src/german/DictGer.gf | 2 +-
 src/german/NounGer.gf | 7 ++++---
 2 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/src/german/DictGer.gf b/src/german/DictGer.gf
index c1557cb13..1b0289a27 100644
--- a/src/german/DictGer.gf
+++ b/src/german/DictGer.gf
@@ -35875,7 +35875,7 @@ lin
   ss_mann_N = mkN  "SS-Mann" "SS-Männer" masculine ;
   ss_N = mkN  "ẞ" "ẞ" neuter ;
   st_vincent_undgrenadinen_N = mkN  "St. Vincent undGrenadinen" "St. Vincent undGrenadinen" neuter ;
-  staat_N = mkN  "Staat" "Staaten" masculine ;
+  staat_N = mkN  "Staat" "Staat" "Staat" "Staats" "Staaten" "Staaten" masculine ;
   staatlich_A = regA "staatlich" ;
   staatsanleihe_N = mkN  "Staatsanleihe" "Staatsanleihen" feminine ;
   staatsanwaeltin_N = mkN  "Staatsanwältin" "Staatsanwältinnen" feminine ;
diff --git a/src/german/NounGer.gf b/src/german/NounGer.gf
index 6a63ba34e..58b75ac6f 100644
--- a/src/german/NounGer.gf
+++ b/src/german/NounGer.gf
@@ -192,10 +192,11 @@ concrete NounGer of Noun = CatGer ** open ResGer, MorphoGer, Prelude in {
         } ;
 
  
-    RelCN cn rs = cn ** {rc = \\n => embedInCommas (rs.s ! RGenNum (gennum cn.g n))} ;
-
+    RelCN cn rs = cn ** {rc = \\n => (cn.rc ! n ++ embedInCommas (rs.s ! RGenNum (gennum cn.g n)))} ;
+    ---- another layer of embedInCommas needed if there is a non-empty rc
+    
     RelNP np rs = np ** {
-      rc = embedInCommas (rs.s ! RGenNum (gennum (genderAgr np.a) (numberAgr np.a))) ;
+      rc = (np.rc ++ embedInCommas (rs.s ! RGenNum (gennum (genderAgr np.a) (numberAgr np.a)))) ;
       isPron = False } ;
 
     SentCN cn s = cn ** {ext = embedInCommas s.s} ;