diff --git a/lib/resource/spanish/BasicSpa.gf b/lib/resource/spanish/BasicSpa.gf index 0206fa645..1a9f228e5 100644 --- a/lib/resource/spanish/BasicSpa.gf +++ b/lib/resource/spanish/BasicSpa.gf @@ -74,7 +74,7 @@ lin father_N2 = deN2 (regN "padre") ; fear_VS = mkVS (regV "temer") ; find_V2 = dirV2 (regV "encontrar") ; - fish_N = regN "pez" ; + fish_N = mascN (regN "pez") ; floor_N = regN "suelo" ; -- piso forget_V2 = dirV2 (regV "olvidar") ; fridge_N = regN "heladera" ; @@ -92,7 +92,7 @@ lin hate_V2 = dirV2 (regV "odiar") ; hat_N = regN "sombrero" ; have_V2 = dirV2 (verboV (tener_4 "tener")) ; - hear_V2 = dirV2 (regV "escuchar") ; -- oír_51 + hear_V2 = mkV2 (regV "escuchar") dative ; -- oír_51 hill_N = regN "colina" ; hope_VS = mkVS (regV "esperar") ; horse_N = regN "caballo" ; @@ -135,12 +135,12 @@ lin pen_N = regN "lapicera" ; planet_N = mascN (regN "planeta") ; plastic_N = regN "plástico" ; - play_V2 = dirV2 (regV "jugar") ; + play_V2 = dirV2 (verboV (jugar_47 "jugar")) ; policeman_N = mascN (regN "policía") ; -- fem refers to the institution priest_N = mascN (regN "cura") ; -- masc probable_AS = mkAS (regA "probable") ; queen_N = regN "reina" ; - radio_N = mkN "radio" "radio" feminine ; + radio_N = femN (regN "radio") ; rain_V0 = mkV0 (verboV (llover_89 "llover")) ; read_V2 = dirV2 (verboV (creer_26 "leer")) ; red_ADeg = regADeg "rojo" ; diff --git a/lib/resource/spanish/BeschSpa.gf b/lib/resource/spanish/BeschSpa.gf index fe7be5fc7..60d5c8c72 100644 --- a/lib/resource/spanish/BeschSpa.gf +++ b/lib/resource/spanish/BeschSpa.gf @@ -2589,6 +2589,72 @@ oper encontrar_38 : Str -> Verbum = \encontrar -> VP (Pass Pl Fem) => enc_ + "ontradas" } } ; +oper contar_38b : Str -> Verbum = \contar -> + let c_ = Predef.tk 5 contar in + {s = table { + VI Infn => c_ + "ontar" ; + VI Ger => c_ + "ontando" ; + VI Part => c_ + "ontado" ; + VP (Pres Ind Sg P1) => c_ + "uento" ; + VP (Pres Ind Sg P2) => c_ + "uentas" ; + VP (Pres Ind Sg P3) => c_ + "uenta" ; + VP (Pres Ind Pl P1) => c_ + "ontamos" ; + VP (Pres Ind Pl P2) => c_ + "ontáis" ; + VP (Pres Ind Pl P3) => c_ + "uentan" ; + VP (Pres Subj Sg P1) => c_ + "uente" ; + VP (Pres Subj Sg P2) => c_ + "uentes" ; + VP (Pres Subj Sg P3) => c_ + "uente" ; + VP (Pres Subj Pl P1) => c_ + "ontemos" ; + VP (Pres Subj Pl P2) => c_ + "ontéis" ; + VP (Pres Subj Pl P3) => c_ + "uenten" ; + VP (Impf Ind Sg P1) => c_ + "ontaba" ; + VP (Impf Ind Sg P2) => c_ + "ontabas" ; + VP (Impf Ind Sg P3) => c_ + "ontaba" ; + VP (Impf Ind Pl P1) => c_ + "ontábamos" ; + VP (Impf Ind Pl P2) => c_ + "ontabais" ; + VP (Impf Ind Pl P3) => c_ + "ontaban" ; + VP (Impf Subj Sg P1) => variants {c_ + "ontara" ; c_ + "ontase"} ; + VP (Impf Subj Sg P2) => variants {c_ + "ontaras" ; c_ + "ontases"} ; + VP (Impf Subj Sg P3) => variants {c_ + "ontara" ; c_ + "ontase"} ; + VP (Impf Subj Pl P1) => variants {c_ + "ontáramos" ; c_ + "ontásemos"} ; + VP (Impf Subj Pl P2) => variants {c_ + "ontarais" ; c_ + "ontaseis"} ; + VP (Impf Subj Pl P3) => variants {c_ + "ontaran" ; c_ + "ontasen"} ; + VP (Pret Sg P1) => c_ + "onté" ; + VP (Pret Sg P2) => c_ + "ontaste" ; + VP (Pret Sg P3) => c_ + "ontó" ; + VP (Pret Pl P1) => c_ + "ontamos" ; + VP (Pret Pl P2) => c_ + "ontasteis" ; + VP (Pret Pl P3) => c_ + "ontaron" ; + VP (Fut Ind Sg P1) => c_ + "ontaré" ; + VP (Fut Ind Sg P2) => c_ + "ontarás" ; + VP (Fut Ind Sg P3) => c_ + "ontará" ; + VP (Fut Ind Pl P1) => c_ + "ontaremos" ; + VP (Fut Ind Pl P2) => c_ + "ontaréis" ; + VP (Fut Ind Pl P3) => c_ + "ontarán" ; + VP (Fut Subj Sg P1) => c_ + "ontare" ; + VP (Fut Subj Sg P2) => c_ + "ontares" ; + VP (Fut Subj Sg P3) => c_ + "ontare" ; + VP (Fut Subj Pl P1) => c_ + "ontáremos" ; + VP (Fut Subj Pl P2) => c_ + "ontareis" ; + VP (Fut Subj Pl P3) => c_ + "ontaren" ; + VP (Cond Sg P1) => c_ + "ontaría" ; + VP (Cond Sg P2) => c_ + "ontarías" ; + VP (Cond Sg P3) => c_ + "ontaría" ; + VP (Cond Pl P1) => c_ + "ontaríamos" ; + VP (Cond Pl P2) => c_ + "ontaríais" ; + VP (Cond Pl P3) => c_ + "ontarían" ; + VP (Imp Sg P1) => variants {} ; + VP (Imp Sg P2) => c_ + "uenta" ; + VP (Imp Sg P3) => c_ + "uente" ; + VP (Imp Pl P1) => c_ + "ontemos" ; + VP (Imp Pl P2) => c_ + "ontad" ; + VP (Imp Pl P3) => c_ + "uenten" ; + VP (Pass Sg Masc) => c_ + "ontado" ; + VP (Pass Sg Fem) => c_ + "ontada" ; + VP (Pass Pl Masc) => c_ + "ontados" ; + VP (Pass Pl Fem) => c_ + "ontadas" + } + } ; oper enraizar_39 : Str -> Verbum = \enraizar -> let enra_ = Predef.tk 4 enraizar in {s = table { diff --git a/lib/resource/spanish/StructuralSpa.gf b/lib/resource/spanish/StructuralSpa.gf index afd6b0e94..36a1086e5 100644 --- a/lib/resource/spanish/StructuralSpa.gf +++ b/lib/resource/spanish/StructuralSpa.gf @@ -54,17 +54,17 @@ lin she_NP = pronNounPhrase pronElle ; so_Adv = ss "tanto" ; ---- somebody_NP = mkNameNounPhrase ["algún"] Masc ; - some_Det = mkDeterminer singular "alguno" "alguna" ; + some_Det = mkDeterminer singular "algun" "alguna" ; some_NDet = mkDeterminerNum "algunos" "algunas" ; something_NP = mkNameNounPhrase ["algo"] Masc ; somewhere_Adv = ss ["en ninguna parte"] ; - that_Det = mkDeterminer singular "eso" "esa" ; + that_Det = mkDeterminer singular "ese" "esa" ; that_NP = mkNameNounPhrase ["eso"] Masc ; therefore_Adv = ss ["por eso"] ; these_NDet = mkDeterminerNum "estos" "estas" ; they8fem_NP = pronNounPhrase pronElles ; they_NP = pronNounPhrase pronIls ; - this_Det = mkDeterminer singular "esto" "esta" ; + this_Det = mkDeterminer singular "este" "esta" ; this_NP = mkNameNounPhrase ["esto"] Masc ; those_NDet = mkDeterminerNum "esos" "esas" ; thou_NP = pronNounPhrase pronTu ; diff --git a/lib/resource/spanish/SwadeshLexSpa.gf b/lib/resource/spanish/SwadeshLexSpa.gf index dddae910b..e00aca7cf 100644 --- a/lib/resource/spanish/SwadeshLexSpa.gf +++ b/lib/resource/spanish/SwadeshLexSpa.gf @@ -182,7 +182,7 @@ concrete SwadeshLexSpa of SwadeshLex = CategoriesSpa water_N = water_N ; wife_N = regN "esposa" ; wind_N = regN "viento" ; - wing_N = mascN (regN "ala") ; -- masc, pl is fem + wing_N = regN "ala" ; woman_N = woman_N ; worm_N = regN "gusano" ; -- lombriz (fem) year_N = regN "año" ; @@ -194,7 +194,7 @@ concrete SwadeshLexSpa of SwadeshLex = CategoriesSpa breathe_V = regV "respirar" ; burn_V = regV "quemar" ; come_V = BasicSpa.come_V ; - count_V = regV "contar" ; + count_V = verboV (contar_38b "contar") ; cut_V = regV "cortar" ; die_V = BasicSpa.die_V ; dig_V = regV "escarbar" ; diff --git a/lib/resource/spanish/TypesSpa.gf b/lib/resource/spanish/TypesSpa.gf index 180a40c35..f72eac447 100644 --- a/lib/resource/spanish/TypesSpa.gf +++ b/lib/resource/spanish/TypesSpa.gf @@ -116,7 +116,9 @@ oper VFin VPasse n p => amare.s ! VP (Pret n p) ; VFin VFut n p => amare.s ! VP (Fut Ind n p) ; VFin VCondit n p => amare.s ! VP (Cond n p) ; - VImper np => amare.s ! VP (Imp Sg P2) ; ---- n p ; + VImper SgP2 => amare.s ! VP (Imp Sg P2) ; + VImper PlP1 => amare.s ! VP (Imp Pl P1) ; + VImper PlP2 => amare.s ! VP (Imp Pl P2) ; VPart g n => amare.s ! VP (Pass n g) } ; aux = a