diff --git a/src/french/DiffFre.gf b/src/french/DiffFre.gf index 6e78c50cb..cbfdf81cb 100644 --- a/src/french/DiffFre.gf +++ b/src/french/DiffFre.gf @@ -3,7 +3,8 @@ instance DiffFre of DiffRomance - [ imperClit, invertedClause, - verbHyphen + verbHyphen, + iAdvQuestionInv ] = open CommonRomance, PhonoFre, Prelude in { @@ -152,6 +153,8 @@ instance DiffFre of DiffRomance - [ _ => c1 ++ c2 } ; + iAdvQuestionInv : Direct = DDir ; + bindHyphen : Str = BIND ++ "-" ++ BIND ; CopulaType = {} ; diff --git a/src/french/ExtraFre.gf b/src/french/ExtraFre.gf index 1776d5644..050ee4873 100644 --- a/src/french/ExtraFre.gf +++ b/src/french/ExtraFre.gf @@ -20,6 +20,10 @@ concrete ExtraFre of ExtraFreAbs = ExtraRomanceFre ** a = aagr Fem Pl } ; + EstcequeCl cl = { + s = \\t,a,p,q => "est-ce" ++ elisQue ++ cl.s ! DDir ! t ! a ! p ! Indic + } ; + i8fem_Pron = mkPronoun (elision "j") (elision "m") (elision "m") "moi" "mon" (elisPoss "m") "mes" Fem Sg P1 ; diff --git a/src/french/ExtraFreAbs.gf b/src/french/ExtraFreAbs.gf index fc815e653..66cd107a1 100644 --- a/src/french/ExtraFreAbs.gf +++ b/src/french/ExtraFreAbs.gf @@ -13,7 +13,11 @@ abstract ExtraFreAbs = ExtraRomanceAbs - [ProDrop] ** { -- These also generate indirect (subordinate) questions. QueestcequeIP : IP ; -- qu'est-ce (que/qui) - QuiestcequeIP : IP ; -- qu'est-ce (que/qui) + QuiestcequeIP : IP ; -- qu'est-ce (que/qui) + +-- This is needed for compositionality in library applications. + + EstcequeCl : Cl -> QCl ; -- est-ce qu'il pleut -- Feminine variants of pronouns (those in $Structural$ are -- masculine, which is the default when gender is unknown). diff --git a/src/romance/DiffRomance.gf b/src/romance/DiffRomance.gf index 902e489c5..e9d0c055f 100644 --- a/src/romance/DiffRomance.gf +++ b/src/romance/DiffRomance.gf @@ -59,6 +59,9 @@ interface DiffRomance = open CommonRomance, Prelude in { oper serCopula : CopulaType ; oper estarCopula : CopulaType ; +-- To decide if adverbial questions are inverted + + oper iAdvQuestionInv : Direct = DInv ; -- except Fre --2 Constants that must derivatively depend on language diff --git a/src/romance/QuestionRomance.gf b/src/romance/QuestionRomance.gf index dde149fc5..9cf5e2c05 100644 --- a/src/romance/QuestionRomance.gf +++ b/src/romance/QuestionRomance.gf @@ -38,8 +38,8 @@ incomplete concrete QuestionRomance of Question = s = \\t,a,p,q => let ord = case q of { - QDir => DInv ; - QIndir => DInv + QDir => iAdvQuestionInv ; + QIndir => iAdvQuestionInv } ; cls = cl.s ! ord ! t ! a ! p ! Indic ; why = iadv.s diff --git a/src/scandinavian/PhraseScand.gf b/src/scandinavian/PhraseScand.gf index f0376a96a..57da4bedd 100644 --- a/src/scandinavian/PhraseScand.gf +++ b/src/scandinavian/PhraseScand.gf @@ -12,7 +12,7 @@ incomplete concrete PhraseScand of Phrase = UttIP ip = {s = ip.s ! nominative} ; --- Acc also UttIAdv iadv = iadv ; - UttNP np = {s = np.s ! accusative} ; + UttNP np = {s = np.s ! nominative} ; UttVP vp = {s = infMark ++ infVP vp (agrP3 Utr Sg)} ; UttAdv adv = adv ; UttCN n = {s = n.s ! Sg ! DIndef ! Nom} ;