diff --git a/lib/resource-1.0/french/DiffFre.gf b/lib/resource-1.0/french/DiffFre.gf index 39e2bb32d..1e76694b8 100644 --- a/lib/resource-1.0/french/DiffFre.gf +++ b/lib/resource-1.0/french/DiffFre.gf @@ -139,6 +139,8 @@ instance DiffFre of DiffRomance = open CommonRomance, PhonoFre, Prelude in { conjThan = elisQue ; conjThat = elisQue ; + subjIf = "si" ; --- s' + clitInf _ cli inf = cli ++ inf ; relPron : Bool => AAgr => Case => Str = \\b,a,c => @@ -159,7 +161,7 @@ instance DiffFre of DiffRomance = open CommonRomance, PhonoFre, Prelude in { quelPron : AAgr => Str = aagrForms "quel" "quelle" "quels" "quelles" ; - partQIndir = elision "c" ; + partQIndir = [] ; --- only for qui,que: elision "c" ; reflPron : Number -> Person -> Case -> Str = \n,p,c -> let pron = argPron Fem n p c in diff --git a/lib/resource-1.0/german/log.txt b/lib/resource-1.0/german/log.txt index 40500bd1d..4be56eea6 100644 --- a/lib/resource-1.0/german/log.txt +++ b/lib/resource-1.0/german/log.txt @@ -281,3 +281,9 @@ work.) The German resource implementation is considered complete, and it is released in the resource grammar version 1.0. +-------------- + +13/12 + +When adding polite imperatives, have to change the lincat of Imp: ImpForm instead +of Number. But the required inflections exist already. diff --git a/lib/resource-1.0/italian/DiffIta.gf b/lib/resource-1.0/italian/DiffIta.gf index 954f7542d..4eac25472 100644 --- a/lib/resource-1.0/italian/DiffIta.gf +++ b/lib/resource-1.0/italian/DiffIta.gf @@ -128,6 +128,8 @@ instance DiffIta of DiffRomance = open CommonRomance, PhonoIta, BeschIta, Prelud conjThan = "che" ; --- di conjThat = "che" ; + subjIf = "se" ; + clitInf b cli inf = inf ++ bindIf b ++ cli ; relPron : Bool => AAgr => Case => Str = \\b,a,c => @@ -141,7 +143,7 @@ instance DiffIta of DiffRomance = open CommonRomance, PhonoIta, BeschIta, Prelud quelPron : AAgr => Str = aagrForms "quale" "quale" "quali" "quali" ; - partQIndir = "ciò" ; + partQIndir = [] ; --- "ciò" ; reflPron : Number -> Person -> Case -> Str = let diff --git a/lib/resource-1.0/romance/DiffRomance.gf b/lib/resource-1.0/romance/DiffRomance.gf index ed372d994..20e888fa3 100644 --- a/lib/resource-1.0/romance/DiffRomance.gf +++ b/lib/resource-1.0/romance/DiffRomance.gf @@ -83,6 +83,8 @@ interface DiffRomance = open CommonRomance, Prelude in { conjThan : Str ; conjThat : Str ; + subjIf : Str ; + relPron : Bool => AAgr => Case => Str ; pronSuch : AAgr => Str ; diff --git a/lib/resource-1.0/romance/QuestionRomance.gf b/lib/resource-1.0/romance/QuestionRomance.gf index 4c9c47d13..00fa08d84 100644 --- a/lib/resource-1.0/romance/QuestionRomance.gf +++ b/lib/resource-1.0/romance/QuestionRomance.gf @@ -10,7 +10,7 @@ incomplete concrete QuestionRomance of Question = let cls = cl.s ! t ! a ! p in table { QDir => cls ! Indic ; - QIndir => "si" ++ cls ! Indic ---- subjIf + QIndir => subjIf ++ cls ! Indic } } ; diff --git a/lib/resource-1.0/spanish/DiffSpa.gf b/lib/resource-1.0/spanish/DiffSpa.gf index fe21a2089..5d16c18c2 100644 --- a/lib/resource-1.0/spanish/DiffSpa.gf +++ b/lib/resource-1.0/spanish/DiffSpa.gf @@ -93,6 +93,8 @@ instance DiffSpa of DiffRomance = open CommonRomance, PhonoSpa, BeschSpa, Prelud conjThan = "que" ; conjThat = "que" ; + subjIf = "si" ; + clitInf b cli inf = inf ++ bindIf b ++ cli ; diff --git a/lib/resource-1.0/spanish/StructuralSpa.gf b/lib/resource-1.0/spanish/StructuralSpa.gf index d14449247..2d445276f 100644 --- a/lib/resource-1.0/spanish/StructuralSpa.gf +++ b/lib/resource-1.0/spanish/StructuralSpa.gf @@ -126,8 +126,8 @@ lin when_IAdv = ss "cuando" ; when_Subj = ss "cuando" ** {m = Indic} ; where_IAdv = ss "donde" ; - whichSg_IDet = {s = \\g,c => prepCase c ++ "cuale" ; n = Sg} ; - whichPl_IDet = {s = \\g,c => prepCase c ++ "cuales" ; n = Pl} ; + whichSg_IDet = {s = \\g,c => prepCase c ++ "qué" ; n = Sg} ; --- cual + whichPl_IDet = {s = \\g,c => prepCase c ++ "qué" ; n = Pl} ; whoPl_IP = {s = \\c => prepCase c ++ "quién" ; a = aagr Masc Pl} ; whoSg_IP = {s = \\c => prepCase c ++ "quién" ; a = aagr Masc Sg} ; why_IAdv = ss "porqué" ;