diff --git a/resource-1.0/Makefile b/resource-1.0/Makefile index bfee27e17..31a6e9ef4 100644 --- a/resource-1.0/Makefile +++ b/resource-1.0/Makefile @@ -7,6 +7,7 @@ test: pretest: echo "gr -cat=Cl -number=11 -prob | tb" | gf -probs=lang.gfprob -path=present:prelude -nocf ../present/Lang???.gfc + langs: echo "s ;; pm | wf langs.gfcm" | gf -nocf -src */Lang??*.gf english/LangEng.gf +RTS -M800M -K100M cp -p */*.gfc */*.gfr ../alltenses diff --git a/resource-1.0/lang.gfprob b/resource-1.0/lang.gfprob index 742081a0b..068127e61 100644 --- a/resource-1.0/lang.gfprob +++ b/resource-1.0/lang.gfprob @@ -15,3 +15,4 @@ --# prob yes_Phr 0.02 --# prob no_Phr 0.02 --# prob TEmpty 0.05 + diff --git a/resource-1.0/romance/DiffRomance.gf b/resource-1.0/romance/DiffRomance.gf index d88648837..5d58ac90d 100644 --- a/resource-1.0/romance/DiffRomance.gf +++ b/resource-1.0/romance/DiffRomance.gf @@ -27,7 +27,7 @@ interface DiffRomance = open CommonRomance, Prelude in { oper partAgr : VType -> VPAgr ; -- Whether participle agrees to foregoing clitic. --- (Fre "je l'ai vue", Ita "io la ho visto") +-- (Fre "je l'ai vue", Spa "yo la he visto") oper vpAgrClit : Agr -> VPAgr ; diff --git a/resource-1.0/spanish/ParadigmsSpa.gf b/resource-1.0/spanish/ParadigmsSpa.gf index c65855292..61a2519af 100644 --- a/resource-1.0/spanish/ParadigmsSpa.gf +++ b/resource-1.0/spanish/ParadigmsSpa.gf @@ -314,7 +314,7 @@ oper {s = table {Posit => a.s ! Posit ; _ => b.s ! Posit} ; isPre = a.isPre ; lock_A = <>} ; compADeg a = - {s = table {Posit => a.s ! Posit ; _ => \\f => "piů" ++ a.s ! Posit ! f} ; + {s = table {Posit => a.s ! Posit ; _ => \\f => "más" ++ a.s ! Posit ! f} ; isPre = a.isPre ; lock_A = <>} ; regADeg a = compADeg (regA a) ; diff --git a/resource-1.0/spanish/StructuralSpa.gf b/resource-1.0/spanish/StructuralSpa.gf index f1e3b4051..f7938c739 100644 --- a/resource-1.0/spanish/StructuralSpa.gf +++ b/resource-1.0/spanish/StructuralSpa.gf @@ -20,7 +20,7 @@ lin behind_Prep = {s = "detrás" ; c = MorphoSpa.genitive ; isDir = False} ; between_Prep = mkPreposition "entre" ; both7and_DConj = {s1,s2 = etConj.s ; n = Pl} ; - but_PConj = ss "mas" ; + but_PConj = ss "pero" ; by8agent_Prep = mkPreposition "por" ; by8means_Prep = mkPreposition "por" ; can8know_VV = mkVV (verboV (saber_71 "saber")) ;