comparative adverbs generalized to cover more of Attempto

3 files changed, 12 insertions, 5 deletions

diff --git a/next-lib/src/german/AdjectiveGer.gf b/next-lib/src/german/AdjectiveGer.gf
index 10b4b3cfd..a0ced749c 100644
--- a/next-lib/src/german/AdjectiveGer.gf
+++ b/next-lib/src/german/AdjectiveGer.gf
@@ -12,6 +12,10 @@ concrete AdjectiveGer of Adjective = CatGer ** open ResGer, Prelude in {
       s = \\af => a.s ! Compar ! af ++ conjThan ++ np.s ! Nom ;
       isPre = True
       } ;
+    CAdvAP ad ap np = {
+      s = \\af => ad.s ++ ap.s ! af ++ ad.p ++ np.s ! Nom ;
+      isPre = False
+      } ;
     UseComparA a = {
       s = \\af => a.s ! Compar ! af ;
       isPre = True
diff --git a/next-lib/src/german/AdverbGer.gf b/next-lib/src/german/AdverbGer.gf
index 4bac57a98..82ccd6193 100644
--- a/next-lib/src/german/AdverbGer.gf
+++ b/next-lib/src/german/AdverbGer.gf
@@ -4,10 +4,10 @@ concrete AdverbGer of Adverb = CatGer ** open ResGer, Prelude in {
     PositAdvAdj a = {s = a.s ! Posit ! APred} ;
 
     ComparAdvAdj cadv a np = {
-      s = cadv.s ++ a.s ! Posit ! APred ++ conjThan ++ np.s ! Nom
+      s = cadv.s ++ a.s ! Posit ! APred ++ cadv.p ++ np.s ! Nom
       } ;
     ComparAdvAdjS cadv a s = {
-      s = cadv.s ++ a.s ! Posit ! APred ++ conjThan ++ s.s ! Sub
+      s = cadv.s ++ a.s ! Posit ! APred ++ cadv.p ++ s.s ! Sub
       } ;
 
     PrepNP prep np = {s = appPrep prep np.s} ;
diff --git a/next-lib/src/german/StructuralGer.gf b/next-lib/src/german/StructuralGer.gf
index beda7514a..b8bba0170 100644
--- a/next-lib/src/german/StructuralGer.gf
+++ b/next-lib/src/german/StructuralGer.gf
@@ -1,6 +1,6 @@
 concrete StructuralGer of Structural = CatGer ** 
 
-  open MorphoGer, Prelude in {
+  open MorphoGer, (X = ConstructX), Prelude in {
 
   flags optimize=all ;
 
@@ -48,9 +48,9 @@ concrete StructuralGer of Structural = CatGer **
   i_Pron = mkPronPers "ich" "mich" "mir" "meiner" "mein" Masc Sg P1 ;
   in_Prep = mkPrep "in" Dat ;
   it_Pron = mkPronPers "es" "es" "ihm" "seiner" "sein"  Neutr Sg P3 ;
-  less_CAdv = ss "weniger" ;
+  less_CAdv = X.mkCAdv "weniger" "als" ;
   many_Det = detLikeAdj Pl "viel" ;
-  more_CAdv = ss "mehr" ;
+  more_CAdv = X.mkCAdv "mehr" "als" ;
   most_Predet = {s = appAdj (regA "meist") ; c = NoCase} ;
   much_Det = detLikeAdj Sg "viel" ;
   must_VV = auxVV 
@@ -143,4 +143,7 @@ concrete StructuralGer of Structural = CatGer **
   at_least_AdN = ss "wenigstens" ;
   at_most_AdN = ss "höchstens" ;
   except_Prep = mkPrep "außer" Dat ;
+
+  as_CAdv = X.mkCAdv "ebenso" "wie" ;
+
 }