Merge branch 'GrammaticalFramework:master' into master

This commit is contained in:
Meowyam
2021-11-25 13:02:47 +08:00
committed by GitHub
2 changed files with 2 additions and 2 deletions

View File

@@ -1,4 +1,4 @@
concrete RelativeEng of Relative = CatEng ** open ResEng in { concrete RelativeEng of Relative = CatEng ** open ResEng, Prelude in {
flags optimize=all_subs ; flags optimize=all_subs ;

View File

@@ -116,7 +116,7 @@ concrete StructuralGer of Structural = CatGer **
we_Pron = mkPronPers "wir" "uns" "uns" "unser" "unser" Fem Pl P1 ; we_Pron = mkPronPers "wir" "uns" "uns" "unser" "unser" Fem Pl P1 ;
whatSg_IP = {s = caselist "was" "was" "was" "wessen" ; n = Sg} ; ---- whatSg_IP = {s = caselist "was" "was" "was" "wessen" ; n = Sg} ; ----
whatPl_IP = {s = caselist "was" "was" "was" "wessen" ; n = Sg} ; -- HL 6/2016 whatPl_IP = {s = caselist "was" "was" "was" "wessen" ; n = Pl} ; -- HL 6/2016
when_IAdv = ss "wann" ; when_IAdv = ss "wann" ;
when_Subj = ss "wenn" ; when_Subj = ss "wenn" ;