diff --git a/next-lib/src/catalan/ParadigmsCat.gf b/next-lib/src/catalan/ParadigmsCat.gf index bea3b8c9b..ec6dc4b81 100644 --- a/next-lib/src/catalan/ParadigmsCat.gf +++ b/next-lib/src/catalan/ParadigmsCat.gf @@ -28,8 +28,6 @@ resource ParadigmsCat = open (Predef=Predef), Prelude, - CommonRomance, - ResCat, MorphoCat, BeschCat, CatCat in { diff --git a/next-lib/src/catalan/StructuralCat.gf b/next-lib/src/catalan/StructuralCat.gf index 8b25882b3..64a25b6f5 100644 --- a/next-lib/src/catalan/StructuralCat.gf +++ b/next-lib/src/catalan/StructuralCat.gf @@ -92,7 +92,7 @@ lin something_NP = pn2np (mkPN ["quelcom"] Masc) ; somewhere_Adv = ss ["a algun lloc"] ; that_Quant = - let aquell : Number => Gender => Case => Str = table { + let aquell : ParadigmsCat.Number => ParadigmsCat.Gender => Case => Str = table { Sg => \\g,c => prepCase c ++ genForms "aquell" "aquella" ! g ; Pl => \\g,c => prepCase c ++ genForms "aquells" "aquelles" ! g } @@ -111,7 +111,7 @@ lin Fem Pl P3 ; this_Quant = - let aquest : Number => Gender => Case => Str = table { + let aquest : ParadigmsCat.Number => ParadigmsCat.Gender => Case => Str = table { Sg => \\g,c => prepCase c ++ genForms "aquest" "aquesta" ! g ; Pl => \\g,c => prepCase c ++ genForms "aquests" "aquestes" ! g } diff --git a/next-lib/src/french/ParadigmsFre.gf b/next-lib/src/french/ParadigmsFre.gf index 224c03c70..d20fc134b 100644 --- a/next-lib/src/french/ParadigmsFre.gf +++ b/next-lib/src/french/ParadigmsFre.gf @@ -28,8 +28,6 @@ resource ParadigmsFre = open (Predef=Predef), Prelude, - CommonRomance, - ResFre, MorphoFre, CatFre in { diff --git a/next-lib/src/italian/LexiconIta.gf b/next-lib/src/italian/LexiconIta.gf index 93e4bcf73..552c372f2 100644 --- a/next-lib/src/italian/LexiconIta.gf +++ b/next-lib/src/italian/LexiconIta.gf @@ -358,4 +358,8 @@ lin question_N = regN "domanda" ; today_Adv = mkAdv "oggi" ; + ready_A = mkA "pronto" ; + reason_N = mkN "raggione" feminine ; + uncertain_A = mkA "insicuro" ; + } ; diff --git a/next-lib/src/italian/ParadigmsIta.gf b/next-lib/src/italian/ParadigmsIta.gf index 88e8a8566..cb2e033ae 100644 --- a/next-lib/src/italian/ParadigmsIta.gf +++ b/next-lib/src/italian/ParadigmsIta.gf @@ -28,8 +28,6 @@ resource ParadigmsIta = open (Predef=Predef), Prelude, - CommonRomance, - ResIta, MorphoIta, BeschIta, CatIta in { diff --git a/next-lib/src/italian/StructuralIta.gf b/next-lib/src/italian/StructuralIta.gf index c8d3618a3..905355b0f 100644 --- a/next-lib/src/italian/StructuralIta.gf +++ b/next-lib/src/italian/StructuralIta.gf @@ -1,5 +1,7 @@ concrete StructuralIta of Structural = CatIta ** - open PhonoIta, MorphoIta, ParadigmsIta, BeschIta, Prelude in { + open + PhonoIta, MorphoIta, + ParadigmsIta, BeschIta, Prelude in { flags optimize=all ; coding=utf8 ; @@ -82,7 +84,7 @@ lin something_NP = pn2np (mkPN ["qualche cosa"] Masc) ; somewhere_Adv = ss ["qualche parte"] ; that_Quant = let - quello : Str -> Str -> Number => Gender => Case => Str = + quello : Str -> Str -> ParadigmsIta.Number => ParadigmsIta.Gender => Case => Str = \quel, quelli -> table { Sg => \\g,c => prepCase c ++ genForms quel "quella" ! g ; Pl => \\g,c => prepCase c ++ genForms quelli "quelle" ! g ---- quegli @@ -104,7 +106,7 @@ lin Masc Pl P3 ; this_Quant = let - questo : Number => Gender => Case => Str = table { + questo : ParadigmsIta.Number => ParadigmsIta.Gender => Case => Str = table { Sg => \\g,c => prepCase c ++ genForms "questo" "questa" ! g ; Pl => \\g,c => prepCase c ++ genForms "questi" "queste" ! g } diff --git a/next-lib/src/romance/ResRomance.gf b/next-lib/src/romance/ResRomance.gf index 483c217f1..4ff8991b8 100644 --- a/next-lib/src/romance/ResRomance.gf +++ b/next-lib/src/romance/ResRomance.gf @@ -305,14 +305,15 @@ oper let vp = useVP vpr ; ----e clpr = pronArg agr.n agr.p vp.clAcc vp.clDat ; --- iform = infForm agr.n agr.p vp.clAcc vp.clDat ; - iform = False ; +----e iform = infForm agr.n agr.p vp.clAcc vp.clDat ; + clpr = ; ----e + iform = False ; ----e inf = (vp.s ! VPInfinit Simul iform).inf ! (aagr agr.g agr.n) ; --- neg = vp.neg ! Pos ; --- Neg not in API --- obj = neg.p2 ++ clpr.p2 ++ vp.comp ! agr ++ vp.ext ! Pos ---- pol + neg = vp.neg ! Pos ; --- Neg not in API + obj = neg.p2 ++ clpr.p2 ++ vp.comp ! agr ++ vp.ext ! Pos ---- pol in -----e clitInf clpr.p3 (clpr.p1 ++ vp.clit2) inf ++ obj ; - inf ; + clitInf clpr.p3 (clpr.p1 ++ vp.clit3) inf ++ obj ; + } -- insertObject: diff --git a/next-lib/src/spanish/ParadigmsSpa.gf b/next-lib/src/spanish/ParadigmsSpa.gf index 90190a1a8..36008eb2d 100644 --- a/next-lib/src/spanish/ParadigmsSpa.gf +++ b/next-lib/src/spanish/ParadigmsSpa.gf @@ -27,8 +27,6 @@ resource ParadigmsSpa = open (Predef=Predef), Prelude, - CommonRomance, - ResSpa, MorphoSpa, BeschSpa, CatSpa in { diff --git a/next-lib/src/spanish/StructuralSpa.gf b/next-lib/src/spanish/StructuralSpa.gf index d9d40145c..033c2a9ab 100644 --- a/next-lib/src/spanish/StructuralSpa.gf +++ b/next-lib/src/spanish/StructuralSpa.gf @@ -92,7 +92,7 @@ lin something_NP = pn2np (mkPN ["algo"] Masc) ; somewhere_Adv = ss ["en ninguna parte"] ; that_Quant = - let ese : Number => Gender => Case => Str = table { + let ese : ParadigmsSpa.Number => ParadigmsSpa.Gender => Case => Str = table { Sg => \\g,c => prepCase c ++ genForms "ese" "esa" ! g ; Pl => \\g,c => prepCase c ++ genForms "esos" "esas" ! g } @@ -110,7 +110,7 @@ lin "su" "su" "sus" "sus" Masc Pl P3 ; this_Quant = - let este : Number => Gender => Case => Str = table { + let este : ParadigmsSpa.Number => ParadigmsSpa.Gender => Case => Str = table { Sg => \\g,c => prepCase c ++ genForms "este" "esta" ! g ; Pl => \\g,c => prepCase c ++ genForms "estos" "estas" ! g }