(Ger) Determiners and DetQuant, DetQuantOrd improved; gender in plural removed; Extend extended

src/german/AdjectiveGer.gf

@@ -41,7 +41,7 @@ concrete AdjectiveGer of Adjective = CatGer ** open ResGer, Prelude in {
 -- $SuperlA$ belongs to determiner syntax in $Noun$.
 
     ComplA2 a np =
-      let CExt = case a.c2.isPrep of {
+      let CExt = case a.c2.t of {
             isCase => <appPrepNP a.c2 np, []> ;
 	    _ => <[], appPrepNP a.c2 np> }
       in {
@@ -54,7 +54,7 @@ concrete AdjectiveGer of Adjective = CatGer ** open ResGer, Prelude in {
     ReflA2 a = 
       let
 	compl = appPrep a.c2 (reflPron ! agrP3 Sg) ;
-	CExt = case a.c2.isPrep of
+	CExt = case a.c2.t of
 		{isCase => <compl, []> ; _ => <[], compl> }
       in {
         s = a.s ! Posit ;

src/german/AllGer.gf

@@ -3,7 +3,6 @@
 concrete AllGer of AllGerAbs =
   LangGer,
   IrregGer,
-----  ExtendGer, ---- to replace ExtraGer
-  ExtraGer
-  ** open ExtendGer in {} ---- to force compilation
+  ExtendGer
+  ** open ExtraGer in {} ---- to force compilation
   ;

src/german/AllGerAbs.gf

@@ -1,8 +1,7 @@
---# -path=.:../abstract:../common:prelude
+--# -path=.:../abstract:../common:../prelude
 
 abstract AllGerAbs = 
   Lang,
   IrregGerAbs,
-----  Extend,
-  ExtraGerAbs
+  Extend
   ** {} ;

src/german/CatGer.gf

@@ -29,7 +29,7 @@ concrete CatGer of Cat =
     IP = {s : Case => Str ; n : Number} ;
     IComp = {s : Agr => Str ; ext : Str} ; 
     IDet = {s : Gender => Case => Str ; n : Number} ;
-    IQuant = {s : Number => Gender => Case => Str} ;
+    IQuant = {s : GenNum => Case => Str} ;
 
 -- Relative
 
@@ -59,26 +59,25 @@ concrete CatGer of Cat =
       g : Gender
       } ;
     NP = ResGer.NP ;
-    Pron = {s : NPForm => Str ; a : Agr} ;
+    Pron = {s : NPForm => Str ; a : Agr ; sp : PossForm => Str} ;
     Det = {s,sp : Bool => Gender => Case => Str ; -- True if DefArt is dropped, HL 8/22
            n : Number ; a : Adjf ; isDef, hasDefArt : Bool} ;
     DAP = {s,sp : Gender => Case => Str ; n : Number ; a : Adjf ; isDef,hasDefArt : Bool} ;
-    -- HL 7/2022: first Bool = True if used to glue in Sg with preposition
-    -- second Bool is True if a cardinal number is present
+
     Quant = {
-      s, sp : Bool => Bool => Number => Gender => Case => Str ;
-      a   : Adjf ;
-      aPl : Adjf ;  --- to distinguish "meine guten Freunde" / "gute Freunde"
-      hasDefArt : Bool
+      s,sp : GenNum => Case => Str ;
+      a : Adjf ;
+      isDefArt : Bool ;
+      delCardOne : Bool -- delete following cardinal 1 (IndefArt and no_Quant)
       } ;
     Predet = {
       s : Number => Gender => Case => Str ;
       c : {p : Str ; k : PredetCase} ;
       a : PredetAgr -- if an agr is forced, e.g. jeder von uns ist ...
       } ;
 
-    Num = {s : Gender => Case => Str ; n : Number ; isNum : Bool} ;
-    Card = {s : Gender => Case => Str ; n : Number} ;
+    Num = {s,sp : AForm => Str ; n : Number ; isNum : Bool} ; -- Num,Card.s AForm HL 12/23
+    Card = {s : AForm => Str ; n : Number} ; -- inflection mainly for: einer,eine,eines
     Ord = {s : AForm => Str} ;
 
 -- Numeral
@@ -95,18 +94,19 @@ concrete CatGer of Cat =
 
 -- Open lexical classes, e.g. Lexicon
 
-    V, VA, VS, VQ = ResGer.Verb ; -- = {s : VForm => Str} ;
+    V, VA, VS, VQ = Verb ; -- = {s : VForm => Str} ;
     VV = Verb ** {isAux : Bool} ;
     V2, V2A, V2S, V2Q = Verb ** {c2 : Preposition} ;
     V2V = Verb ** {c2 : Preposition ; isAux : Bool ; objCtrl : Bool} ;
     V3 = Verb ** {c2, c3 : Preposition} ;
 
-    A  = {s : Degree => AForm => Str} ;
-    A2 = {s : Degree => AForm => Str ; c2 : Preposition} ;
+    A  = Adjective ; -- = {s : Degree => AForm => Str} ;
+    A2 = Adjective ** {c2 : Preposition} ;
 
-    N  = ResGer.Noun ;
-    N2 = ResGer.Noun ** {c2 : Preposition} ;
-    N3 = ResGer.Noun ** {c2,c3 : Preposition} ;
+    N  = Noun ; -- {s : Number => Case => Str ; co : Str ;
+                --  uncap : {s: Number => Case => Str ; co : Str} ; g : Gender}
+    N2 = Noun ** {c2 : Preposition} ;
+    N3 = Noun ** {c2,c3 : Preposition} ;
     GN = {s : Case => Str; g : Sex} ;
     SN = {s : Sex => Case => Str} ;
     PN = {s : Case => Str; g : Gender; n : Number} ;
@@ -119,7 +119,7 @@ concrete CatGer of Cat =
 
   linref
     NP = \np -> np.s ! False ! Nom ++ np.ext ++ np.rc ; -- HL 7/2022 Bool added
-    CN = \cn -> cn.s ! Strong ! Pl ! Nom ++ cn.adv ++ cn.ext ++ cn.rc ! Pl ;
+    CN = \cn -> cn.s ! Strong ! Sg ! Nom ++ cn.adv ++ cn.ext ++ cn.rc ! Sg ;
 
     SSlash = \ss -> ss.s ! Main ++ ss.c2.s ! GPl ;
     ClSlash = \cls -> cls.s ! MIndic ! Pres ! Simul ! Pos ! Main ++ cls.c2.s ! GPl ;
@@ -140,7 +140,7 @@ concrete CatGer of Cat =
     Conj = \c -> c.s1 ++ c.s2 ;
 
     Det = \det -> det.s ! False ! Masc ! Nom ;
-    Prep = \prep -> case prep.isPrep of {isPrepDefArt => prep.s ! GSg Masc ;
-                                         _ => prep.s ! GPl } ;
+    Prep = \prep -> case prep.t of {isPrepDefArt => prep.s ! GSg Masc ;
+                                    _ => prep.s ! GPl } ;
 
 }

src/german/ConstructionGer.gf

@@ -2,7 +2,7 @@
 
 concrete ConstructionGer of Construction = CatGer **
   open SyntaxGer, SymbolicGer, (P = ParadigmsGer),
-       (L = LexiconGer), (E = ExtraGer), (G = GrammarGer), (I = IrregGer), (R = ResGer), (N = NounGer), Prelude in {
+       (L = LexiconGer), (E = ExtendGer), (G = GrammarGer), (I = IrregGer), (R = ResGer), (N = NounGer), Prelude in {
 flags coding=utf8 ;
 
 oper
@@ -89,7 +89,7 @@ lin
       in  SyntaxGer.mkAdv (for_Prep | accPrep) n_hours_NP ;
 
     timeunitRange l u time =
-      {s = l.s ! R.Masc ! R.Nom ++ "bis" ++ u.s ! R.Masc ! R.Nom ++ time.s ! R.Pl ! R.Nom} ;
+      {s = l.s ! R.AMod (R.gennum R.Masc l.n) R.Nom ++ "bis" ++ u.s ! R.AMod (R.gennum R.Masc u.n) R.Nom ++ time.s ! R.Pl ! R.Nom} ;
 
   oper
     mkHour : Str -> Str -> Str -> Hour