diff --git a/lib/resource/catalan/LexiconCat.gf b/lib/resource/catalan/LexiconCat.gf index 9b9f8f062..a2122fd5e 100644 --- a/lib/resource/catalan/LexiconCat.gf +++ b/lib/resource/catalan/LexiconCat.gf @@ -18,19 +18,19 @@ lin apartment_N = regMN "pis" ; apple_N = regFN "poma" ; art_N = regMN "art" ; --- ask_V2Q = mkV2Q (regV "preguntar") dative ; + ask_V2Q = mkV2Q (regV "preguntar") dative ; baby_N = regMN "nadó" ; bad_A = mkADeg (regA "dolent") (regA "pitjor") ; bank_N = regMN "banc" ; - beautiful_A = prefA (regADeg "bell") ; --- become_VA = reflV (regV "convertir") ; --- convertirse en, volverse, ponerse + beautiful_A = prefA (regADeg "bell") ; + become_VA = reflV (regV "tornar") ; -- esdevenir beer_N = regFN "cervesa" ; --- beg_V2V = mkV2V (regV "rogar") accusative dative ; -- pedir + beg_V2V = mkV2V (regV "demanar") accusative dative ; big_A = regADeg "gros" ; bike_N = regFN "bicicleta" ; bird_N = regMN "ocell" ; - black_A = regADeg "negre" ; - blue_A = regADeg "blau" ; + black_A = compADeg (mkA "negre" "negra" "negres" "negres" "negrament") ; + blue_A = compADeg (mkA "blau" "blava" "blaus" "blaves" "blavament") ; boat_N = regFN "barca" ; book_N = regMN "llibre" ; boot_N = regFN "bota" ; @@ -38,12 +38,12 @@ lin boy_N = regMN "noi" ; bread_N = irregMN "pa" "pans" ; break_V2 = dirV2 (regV "trencar") ; - broad_A = regADeg "ample" ; + broad_A = regADeg "ample" ; -- put it in MorphoCat?: like black_A brother_N2 = deN2 (regMN "germà") ; - brown_A = compADeg (mkA "marró" "marrona" "marrons" "marrones" "marronament") ; --- * + brown_A = compADeg (mkA "marró" "marrona" "marrons" "marrones" "marronament") ; butter_N = regFN "mantega" ; buy_V2 = dirV2 (regV "comprar") ; - camera_N = regFN "càmara" ; -- ["máquina fotográfica"] + camera_N = regFN "càmara" ; cap_N = regFN "gorra" ; car_N = regMN "cotxe" ; carpet_N = regFN "catifa" ; @@ -67,17 +67,17 @@ lin die_V = verbV (morir_71 "morir") ; dirty_A = regADeg "brut" ; distance_N3 = mkN3 (regFN "distància") genitive dative ; - doctor_N = regMN "metge" ; -- metgessa + doctor_N = regMN "metge" ; -- metgessa dog_N = regMN "gos" ; -- gossa door_N = regFN "porta" ; --- drink_V2 = dirV2 (regV "tomar") ; -- beber --- easy_A2V = mkA2V (regA "fácil") dative genitive ; + drink_V2 = dirV2 (regV "beure") ; + easy_A2V = mkA2V (regA "fácil") dative genitive ; eat_V2 = dirV2 (regV "menjar") ; empty_A = compADeg (mkA "buit" "buida" "buits" "buides" "buidament") ; enemy_N = regMN "enemic" ; -- enemiga - factory_N = regFN "fàbrica" ; + factory_N = regFN "fàbrica" ; father_N2 = deN2 (regMN "pare") ; --- fear_VS = mkVS (regV "temer") ; + fear_VS = mkVS (regV "tèmer") ; find_V2 = dirV2 (regV "trobar") ; fish_N = regMN "peix" ; floor_N = regMN "terra" ; -- sòl @@ -85,18 +85,18 @@ lin fridge_N = regFN "nevera" ; friend_N = regMN "amic" ; -- amiga fruit_N = regFN "fruita" ; --- fun_AV = mkAV (regA "divertido") genitive ; -- entretenido + fun_AV = mkAV (regA "divertit") genitive ; garden_N = regMN "jardí" ; girl_N = regFN "noia" ; glove_N = regMN "guant" ; gold_N = regMN "or" ; good_A = mkADeg (mkA "bó" "bona" "bons" "bones" "bonament") (regA "millor") ; ---- adv? --- go_V = (verbV (anar_4 "anar")) ; + go_V = (verbV (anar_4 "anar")) ; green_A = regADeg "verd" ; harbour_N = regMN "port" ; hate_V2 = dirV2 (regV "odiar") ; hat_N = regMN "barret" ; --- have_V2 = dirV2 (verbV (tenir_108 "tenir")) ; + have_V2 = dirV2 (verbV (tenir_108 "tenir")) ; hear_V2 = mkV2 (regV "escoltar") dative ; hill_N = regMN "turó" ; hope_VS = mkVS (regV "esperar") ; @@ -113,15 +113,15 @@ lin learn_V2 = dirV2 (regV "aprendre") ; leather_N = regMN "cuiro" ; leave_V2 = dirV2 (regV "partir") ; --- like_V2 = dirV2 (regV "agradar") ; + like_V2 = dirV2 (regV "agradar") ; listen_V2 = dirV2 (regV "escoltar") ; live_V = verbV (viure_119 "viure") ; - long_A = regADeg "llarg" ; --- lose_V2 = dirV2 (verbV "perdre") ; + long_A = regADeg "llarg" ; + lose_V2 = dirV2 (regV "perdre") ; love_N = regMN "amor" ; love_V2 = dirV2 (regV "estimar") ; man_N = regMN "home" ; -- masc --- married_A2 = mkA2 (regA "casado") dative ; + married_A2 = mkA2 (regA "casat") dative ; meat_N = regFN "carn" ; milk_N = regFN "llet" ; moon_N = regFN "lluna" ; @@ -133,8 +133,8 @@ lin newspaper_N = regMN "diari" ; -- periòdic oil_N = regMN "oli" ; old_A = regADeg "vell" ; --- open_V2 = dirV2 (special_ppV (regV "abrir") "abierto") ; --- paint_V2A = mkV2A (regV "pintar") accusative (mkPreposition "en") ; + open_V2 = dirV2 (regV "obrir") ; + paint_V2A = mkV2A (regV "pintar") accusative (mkPrep "en") ; paper_N = regMN "paper" ; paris_PN = mkPN "Paris" masculine ; peace_N = regFN "pau" ; @@ -147,8 +147,8 @@ lin probable_AS = mkAS (regA "probable") ; queen_N = regN "reina" ; radio_N = regFN "ràdio" ; --- rain_V0 = mkV0 (verbV (moure_72 "ploure")) ; --- read_V2 = dirV2 (verbV (servir_101 "llegir")) ; + rain_V0 = mkV0 (verbV (moure_72 "ploure")) ; + read_V2 = dirV2 (verbV (servir_101 "llegir")) ; red_A = regADeg "vermell" ; religion_N = mkN "religió" "religions" feminine ; restaurant_N = regMN "restaurant" ; @@ -156,28 +156,28 @@ lin rock_N = regFN "roca" ; roof_N = regFN "teulada" ; rubber_N = regFN "goma" ; --- run_V = regV (verbV (córrer_30 "córrer")) ; --- say_VS = mkVS (verbV (dir_41 "dir")) ; + run_V = verbV (córrer_30 "córrer") ; + say_VS = mkVS (verbV (dir_41 "dir")) ; school_N = regFN "escola" ; science_N = regFN "ciència" ; sea_N = regMN "mar" ; -- masc & fem --- seek_V2 = dirV2 (regV (trencar_112 "buscar")) ; --- see_V2 = dirV2 (verbV (veure_118 "veure")) ; --- sell_V3 = dirV3 (regV (vendre_116 "vendre")) dative ; + seek_V2 = dirV2 (verbV (trencar_112 "buscar")) ; + see_V2 = dirV2 (verbV (veure_118 "veure")) ; + sell_V3 = dirV3 (verbV (vendre_116 "vendre")) dative ; send_V3 = dirV3 (regV "enviar") dative ; sheep_N = regFN "ovella" ; -- xai ship_N = regMN "vaixell" ; shirt_N = regFN "camisa" ; shoe_N = regFN "sabata" ; shop_N = regFN "botiga" ; - short_A = regADeg "curt" ; --- breu + short_A = regADeg "curt" ; --- breu silver_N = regFN "plata" ; sister_N = regFN "germana" ; --- sleep_V = verbV (dormir_44 "dormir") ; - small_A = prefA (regADeg "petit") ; + sleep_V = verbV (dormir_44 "dormir") ; + small_A = prefA (regADeg "petit") ; snake_N = regFN "serp" ; -- fem sock_N = regMN "mitjó" ; --- speak_V2 = dirV2 (regV "parlar") ; + speak_V2 = dirV2 (regV "parlar") ; star_N = regFN "estrella" ; steel_N = regMN "acer" ; stone_N = regFN "pedra" ; @@ -185,25 +185,25 @@ lin student_N = regN "estudiant" ; -- used both for fem & masc stupid_A = regADeg "estúpid" ; sun_N = regMN "sol" ; --- switch8off_V2 = dirV2 (regV (pregar_86 "apagar")) ; --- switch8on_V2 = dirV2 (regV (atendre_8 "encendre")) ; + switch8off_V2 = dirV2 (verbV (pregar_86 "apagar")) ; + switch8on_V2 = dirV2 (verbV (atendre_8 "encendre")) ; table_N = regFN "taula" ; --- talk_V3 = mkV3 (regV "parlar") dative genitive ; + talk_V3 = mkV3 (regV "parlar") dative genitive ; teacher_N = regMN "mestre" ; -- mestra --- teach_V2 = dirV2 (regV "ensenyar") ; + teach_V2 = dirV2 (regV "ensenyar") ; television_N = mkN "televisió" "televisions" feminine ; -- televisor masc thick_A = compADeg (mkA "gruixut" "gruixuda" "gruixuts" "gruixudes" "gruixudament") ; thin_A = compADeg (mkA "fi" "fina" "fins" "fines" "finament") ; train_N = regMN "tren" ; --- travel_V = regV (envejar_48 "viajar") ; + travel_V = verbV (envejar_48 "viatjar") ; tree_N = regMN "arbre" ; --- trousers_N = regN "pantalón" ; -- masc ugly_A = compADeg (mkA "lleig" "lletja" "lletjos" "lletges" "lletjament") ; --- understand_V2 = dirV2 (regV (atendre_8 "entendre")) ; + understand_V2 = dirV2 (verbV (atendre_8 "entendre")) ; university_N = regFN "universitat" ; village_N = regMN "poble" ; --- wait_V2 = mkV2 (regV "esperar") dative ; --- walk_V = regV "caminar" ; + wait_V2 = mkV2 (regV "esperar") dative ; + walk_V = regV "caminar" ; warm_A = regADeg "tebi" ; war_N = regFN "guerra" ; watch_V2 = dirV2 (regV "mirar") ; @@ -211,40 +211,38 @@ lin white_A = compADeg (mkA "blanc" "blanca" "blancs" "blanques" "blancament") ; window_N = regFN "finestra" ; wine_N = regMN "vi" ; --- win_V2 = dirV2 (regV "guanyar") ; + win_V2 = dirV2 (regV "guanyar") ; woman_N = regFN "dona" ; --- wonder_VQ = mkVQ (reflV (regV "preguntar")) ; + wonder_VQ = mkVQ (reflV (regV "preguntar")) ; wood_N = regFN "fusta" ; --- write_V2 = dirV2 (special_ppV (regV (escriure_50 "escriure")) "escrito") ; - yellow_A = compADeg (mkA "groc" "groga" "grocs" "grogues" "grogament") ; - young_A = compADeg (mkA "jove" "jove" "joves" "joves" "jovement") ; --- --- do_V2 = dirV2 (verbV (fer_56 "fer")) ; + write_V2 = dirV2 (verbV (escriure_50 "escriure")) ; + yellow_A = compADeg (mkA "groc" "groga" "grocs" "grogues" "grogament") ; + young_A = compADeg (mkA "jove" "jove" "joves" "joves" "jovement") ; + do_V2 = dirV2 (verbV (fer_56 "fer")) ; now_Adv = mkAdv "ara" ; already_Adv = mkAdv "ja" ; song_N = mkN "cançó" "cançons" feminine ; - add_V3 = dirV3 (regV "sumar") dative ; + add_V3 = dirV3 (regV "sumar") dative ; number_N = regMN "número" ; --- put_V2 = dirV2 (verbV "posar") ; --- stop_V = regV "parar" ; --- jump_V = regV "saltar" ; --- --- left_Ord = mkOrd (regA "izquierda") ; --- right_Ord = mkOrd (regA "derecha") ; --- far_Adv = mkAdv "lejos" ; ----? - correct_A = regA "correcte" ; - dry_A = regA "sec" ; - dull_A = regA "balb" ; - full_A = regA "ple" ; - heavy_A = regA "pesat" ; - near_A = regA "proper" ; - rotten_A = regA "podrit" ; - round_A = regA "rodó" ; - sharp_A = regA "esmolat" ; -- punxegut - smooth_A = regA "llis" ; - straight_A = regA "directe" ; - wet_A = regA "moll" ; - wide_A = regA "extens" ; + put_V2 = dirV2 (regV "posar") ; + stop_V = regV "aturar" ; + jump_V = regV "saltar" ; + left_Ord = M.mkOrd (regA "esquerra") ; + right_Ord = M.mkOrd (regA "dreta") ; + far_Adv = mkAdv "lluny" ; + correct_A = regA "correcte" ; + dry_A = regA "sec" ; + dull_A = regA "balb" ; + full_A = regA "ple" ; + heavy_A = regA "pesat" ; + near_A = regA "proper" ; + rotten_A = regA "podrit" ; + round_A = regA "rodó" ; + sharp_A = regA "esmolat" ; -- punxegut + smooth_A = regA "llis" ; + straight_A = regA "directe" ; + wet_A = regA "moll" ; + wide_A = regA "extens" ; animal_N = regMN "animal" ; -- masc (sometimes fem when adj) ashes_N = regMN "cendra" ; back_N = regFN "esquena" ; @@ -308,54 +306,60 @@ lin wing_N = regFN "ala" ; worm_N = regMN "cuc" ; year_N = regMN "any" ; - bite_V2 = dirV2 (regV "mossegar") ; - blow_V = regV "bufar" ; - burn_V = regV "cremar" ; - count_V2 = dirV2 (regV "comptar") ; - cut_V2 = dirV2 (regV "tallar") ; - dig_V = regV "cavar" ; - fall_V = verbV (caure_18 "caure") ; - fear_V2 = dirV2 (verbV (témer_107 "témer")) ; - fight_V2 = dirV2 (regV "lluitar") ; - float_V = regV "surar" ; - flow_V = regV "circular" ; - fly_V = regV "volar" ; - freeze_V = regV "congelar" ; - give_V3 = dirdirV3 (verbV (donar_43 "donar")) ; - hit_V2 = dirV2 (regV "picar") ; - hold_V2 = dirV2 (verbV (obtenir_78 "sostenir")) ; - hunt_V2 = dirV2 (regV "caçar") ; - kill_V2 = dirV2 (regV "matar") ; - laugh_V = verbV (riure_96 "riure") ; --- lie_V = reflV (regV "estirar") ; - play_V = verbV (pregar_86 "jugar") ; - pull_V2 = dirV2 (regV "tibar") ; - push_V2 = dirV2 (verbV (atènyer_59 "empènyer")) ; - rub_V2 = dirV2 (verbV (pregar_86 "refregar")) ; - scratch_V2 = dirV2 (regV "gratar") ; - sew_V = regV "cosir" ; - sing_V = regV "cantar" ; --- sit_V = reflV (regV "sentar") ; - smell_V = verbV (cantar_15 "ensumar") ; - spit_V = verbV (escopir_49 "escopir") ; --- split_V2 = dirV2 (regV "separar") ; -- dividir,) ; --- squeeze_V2 = dirV2 (regV "exprimir") ; --- stab_V2 = dirV2 (regV "apuñalar") ; --- stand_V = verbV (estar_2 "estar") ; ---- "estar dret" ; - suck_V2 = dirV2 (regV "xuclar") ; - swell_V = regV "inflar" ; - swim_V = regV "nedar" ; - think_V = regV "pensar" ; - throw_V2 = dirV2 (verbV (començar_22 "llençar")) ; - tie_V2 = dirV2 (verbV (pregar_86 "lligar")) ; - turn_V = verbV (pregar_86 "doblegar") ; - vomit_V = verbV (envejar_48 "vomitar") ; - wash_V2 = dirV2 (regV "rentar") ; - wipe_V2 = dirV2 (verbV (pregar_86 "eixugar")) ; - breathe_V = regV "respirar" ; --- - john_PN = mkPN "Joan" masculine ; - today_Adv = mkAdv "hui" ; + bite_V2 = dirV2 (regV "mossegar") ; + blow_V = regV "bufar" ; + burn_V = regV "cremar" ; + count_V2 = dirV2 (regV "comptar") ; + cut_V2 = dirV2 (regV "tallar") ; + dig_V = regV "cavar" ; + fall_V = verbV (caure_18 "caure") ; + fear_V2 = dirV2 (verbV (témer_107 "témer")) ; + fight_V2 = dirV2 (regV "lluitar") ; + float_V = regV "surar" ; + flow_V = regV "circular" ; + fly_V = regV "volar" ; + freeze_V = regV "congelar" ; + give_V3 = dirdirV3 (verbV (donar_43 "donar")) ; + hit_V2 = dirV2 (regV "picar") ; + hold_V2 = dirV2 (verbV (obtenir_78 "sostenir")) ; + hunt_V2 = dirV2 (regV "caçar") ; + kill_V2 = dirV2 (regV "matar") ; + laugh_V = verbV (riure_96 "riure") ; + lie_V = reflV (regV "jeure") ; + play_V = verbV (pregar_86 "jugar") ; + pull_V2 = dirV2 (regV "tibar") ; + push_V2 = dirV2 (verbV (atènyer_59 "empènyer")) ; + rub_V2 = dirV2 (verbV (pregar_86 "refregar")) ; + scratch_V2 = dirV2 (regV "gratar") ; + sew_V = regV "cosir" ; + sing_V = regV "cantar" ; + sit_V = reflV (regV "seure") ; + smell_V = verbV (cantar_15 "ensumar") ; + spit_V = verbV (escopir_49 "escopir") ; + split_V2 = dirV2 (regV "separar") ; -- dividir,) ; + squeeze_V2 = dirV2 (regV "exprèmer") ; + stab_V2 = dirV2 (regV "apunyalar") ; + stand_V = verbV (estar_54 "estar") ; ---- "estar dret" + suck_V2 = dirV2 (regV "xuclar") ; + swell_V = regV "inflar" ; + swim_V = regV "nedar" ; + think_V = regV "pensar" ; + throw_V2 = dirV2 (verbV (començar_22 "llençar")) ; + tie_V2 = dirV2 (verbV (pregar_86 "lligar")) ; + turn_V = verbV (pregar_86 "doblegar") ; + vomit_V = verbV (envejar_48 "vomitar") ; + wash_V2 = dirV2 (regV "rentar") ; + wipe_V2 = dirV2 (verbV (pregar_86 "eixugar")) ; + breathe_V = regV "respirar" ; + john_PN = mkPN "Joan" masculine ; + today_Adv = mkAdv "avui" ; + grammar_N = regFN "gramàtica" ; + language_N = regFN "llengua" ; + rule_N = regFN "regla" ; + question_N = regFN "pregunta" ; + ready_A = regA "preparat" ; + reason_N = regFN "raó" ; + uncertain_A = regA "incert" ; } ; diff --git a/lib/resource/catalan/ParadigmsCat.gf b/lib/resource/catalan/ParadigmsCat.gf index f00247960..a2f35f0b1 100644 --- a/lib/resource/catalan/ParadigmsCat.gf +++ b/lib/resource/catalan/ParadigmsCat.gf @@ -55,13 +55,13 @@ oper -- amalgamate with the following word (the 'genitive' "de" and the -- 'dative' "a"). - Preposition : Type ; + --- Preposition : Type ; - accusative : Preposition ; - genitive : Preposition ; - dative : Preposition ; + accusative : Prep ; + genitive : Prep ; + dative : Prep ; - mkPreposition : Str -> Preposition ; + mkPrep : Str -> Prep ; --2 Nouns @@ -100,7 +100,7 @@ oper -- -- Relational nouns ("filla de x") need a case and a preposition. - mkN2 : N -> Preposition -> N2 ; + mkN2 : N -> Prep -> N2 ; -- The most common cases are the genitive "de" and the dative "a", -- with the empty preposition. @@ -110,7 +110,7 @@ oper -- Three-place relational nouns ("la connexió de x a y") need two prepositions. - mkN3 : N -> Preposition -> Preposition -> N3 ; + mkN3 : N -> Prep -> Prep -> N3 ; ----3 Relational common noun phrases @@ -156,7 +156,7 @@ oper ---- ---- Two-place adjectives need a preposition for their second argument. -- - mkA2 : A -> Preposition -> A2 ; + mkA2 : A -> Prep -> A2 ; -- ----3 Comparison adjectives -- @@ -221,7 +221,7 @@ oper -- Two-place verbs need a preposition, except the special case with direct object. -- (transitive verbs). Notice that a particle comes from the $V$. - mkV2 : V -> Preposition -> V2 ; + mkV2 : V -> Prep -> V2 ; dirV2 : V -> V2 ; @@ -234,8 +234,8 @@ oper ---- Three-place (ditransitive) verbs need two prepositions, of which ---- the first one or both can be absent. - mkV3 : V -> Preposition -> Preposition -> V3 ; -- parlar, a, de - dirV3 : V -> Preposition -> V3 ; -- donar,_,a + mkV3 : V -> Prep -> Prep -> V3 ; -- parlar, a, de + dirV3 : V -> Prep -> V3 ; -- donar,_,a dirdirV3 : V -> V3 ; -- donar,_,_ ----3 Other complement patterns @@ -243,23 +243,23 @@ oper ---- Verbs and adjectives can take complements such as sentences, ---- questions, verb phrases, and adjectives. -- --- mkV0 : V -> V0 ; + mkV0 : V -> V0 ; mkVS : V -> VS ; - mkV2S : V -> Preposition -> V2S ; + mkV2S : V -> Prep -> V2S ; mkVV : V -> VV ; -- plain infinitive: "je veux parler" -- deVV : V -> VV ; -- "j'essaie de parler" -- aVV : V -> VV ; -- "j'arrive à parler" --- mkV2V : V -> Preposition -> Preposition -> V2V ; + mkV2V : V -> Prep -> Prep -> V2V ; -- mkVA : V -> VA ; --- mkV2A : V -> Preposition -> Preposition -> V2A ; - mkVQ : V -> VQ ; --- mkV2Q : V -> Preposition -> V2Q ; + mkV2A : V -> Prep -> Prep -> V2A ; + mkVQ : V -> VQ ; + mkV2Q : V -> Prep -> V2Q ; -- mkAS : A -> AS ; -- mkA2S : A -> Preposition -> A2S ; --- mkAV : A -> Preposition -> AV ; --- mkA2V : A -> Preposition -> Preposition -> A2V ; + mkAV : A -> Prep -> AV ; + mkA2V : A -> Prep -> Prep -> A2V ; -- ---- Notice: categories $V2S, V2V, V2Q$ are in v 1.0 treated ---- just as synonyms of $V2$, and the second argument is given @@ -283,11 +283,11 @@ oper singular = Sg ; plural = Pl ; - Preposition = Compl ; + --- Preposition = Compl ; accusative = complAcc ; genitive = complGen ; dative = complDat ; - mkPreposition p = {s = p ; c = Acc ; isDir = False} ; + mkPrep p = {s = p ; c = Acc ; isDir = False; lock_Prep = <>} ; -- -- mkN x y g = mkNounIrreg x y g ** {lock_N = <>} ; @@ -344,7 +344,7 @@ oper -- } in verbBesch verb ** {vtyp = VHabere ; lock_V = <>} ; --- reflV v = {s = v.s ; vtyp = VRefl ; lock_V = <>} ; + reflV v = {s = v.s ; vtyp = VRefl ; lock_V = <>} ; verbV ve = verbBesch ve ** {vtyp = VHabere ; lock_V = <>} ; @@ -367,25 +367,25 @@ oper dirV3 v p = mkV3 v accusative p ; dirdirV3 v = dirV3 v dative ; -- --- V0 : Type = V ; + V0 : Type = V ; AS, AV : Type = A ; --- A2S, A2V : Type = A2 ; + A2S, A2V : Type = A2 ; -- --- mkV0 v = v ** {lock_V0 = <>} ; + mkV0 v = v ** {lock_V0 = <>} ; mkVS v = v ** {m = \\_ => Indic ; lock_VS = <>} ; ---- more moods mkV2S v p = mkV2 v p ** {mn,mp = Indic ; lock_V2S = <>} ; mkVV v = v ** {c2 = complAcc ; lock_VV = <>} ; -- deVV v = v ** {c2 = complGen ; lock_VV = <>} ; -- aVV v = v ** {c2 = complDat ; lock_VV = <>} ; --- mkV2V v p t = mkV2 v p ** {c3 = t.p1 ; s3 = p.p2 ; lock_V2V = <>} ; + mkV2V v p t = mkV3 v p t ** { lock_V2V = <>} ; -- mkVA v = v ** {lock_VA = <>} ; --- mkV2A v p q = mkV3 v p q ** {lock_V2A = <>} ; + mkV2A v p q = mkV3 v p q ** {lock_V2A = <>} ; mkVQ v = v ** {lock_VQ = <>} ; --- mkV2Q v p = mkV2 v p ** {lock_V2Q = <>} ; + mkV2Q v p = mkV2 v p ** {lock_V2Q = <>} ; -- mkAS v = v ** {lock_AS = <>} ; ---- more moods -- mkA2S v p = mkA2 v p ** {lock_A2S = <>} ; --- mkAV v p = v ** {c = p.p1 ; s2 = p.p2 ; lock_AV = <>} ; --- mkA2V v p q = mkA2 v p ** {s3 = q.p2 ; c3 = q.p1 ; lock_A2V = <>} ; + mkAV v p = v ** {c = p.p1 ; s2 = p.p2 ; lock_AV = <>} ; + mkA2V v p q = mkA2 v p ** {s3 = q.p2 ; c3 = q.p1 ; lock_A2V = <>} ; -- } ; diff --git a/lib/resource/catalan/StructuralCat.gf b/lib/resource/catalan/StructuralCat.gf index 84e401048..ba1f0508d 100644 --- a/lib/resource/catalan/StructuralCat.gf +++ b/lib/resource/catalan/StructuralCat.gf @@ -5,27 +5,27 @@ concrete StructuralCat of Structural = CatCat ** lin - above_Prep = mkPreposition "sobre" ; - after_Prep = {s = ["desprŽs"] ; c = MorphoCat.genitive ; isDir = False} ; + above_Prep = mkPrep "sobre" ; + after_Prep = {s = ["després"] ; c = MorphoCat.genitive ; isDir = False} ; all_Predet = { s = \\a,c => prepCase c ++ aagrForms "tot" "tota" "tots" "totes" ! a ; c = Nom } ; - almost_AdA, almost_AdN = ss (variants {"quasi"; "gairebè"}) ; + almost_AdA, almost_AdN = ss (variants {"quasi"; "gairebé"}) ; always_AdV = ss "sempre" ; - although_Subj = ss "benché" ** {m = Conjunct} ; + although_Subj = ss "benché" ** {m = Conjunct} ; and_Conj = {s1 = [] ; s2 = etConj.s ; n = Pl} ; because_Subj = ss "perque" ** {m = Indic} ; before_Prep = {s = "abans" ; c = MorphoCat.genitive ; isDir = False} ; behind_Prep = {s = "darrera" ; c = MorphoCat.genitive ; isDir = False} ; - between_Prep = mkPreposition "entre" ; + between_Prep = mkPrep "entre" ; both7and_DConj = {s1,s2 = etConj.s ; n = Pl} ; - but_PConj = ss "per˜" ; - by8agent_Prep = mkPreposition "per" ; - by8means_Prep = mkPreposition "mitjançant" ; --- can8know_VV = mkVV (verbV (saber_71 "saber")) ; --- can_VV = mkVV (verbV (poder_58 "poder")) ; - during_Prep = mkPreposition "durant" ; ---- + but_PConj = ss "però" ; + by8agent_Prep = mkPrep "per" ; + by8means_Prep = mkPrep "mitjançant" ; + can8know_VV = mkVV (verbV (saber_99 "saber")) ; + can_VV = mkVV (verbV (poder_85 "poder")) ; + during_Prep = mkPrep "durant" ; ---- either7or_DConj = {s1,s2 = "o" ; n = Sg} ; everybody_NP = makeNP ["tothom"] Masc Sg ; every_Det = {s = \\_,_ => "cada" ; n = Sg} ; @@ -33,15 +33,16 @@ lin everywhere_Adv = ss ["a tot arreu"] ; few_Det = {s = \\g,c => prepCase c ++ genForms "pocs" "poques" ! g ; n = Pl} ; --- first_Ord = {s = \\ag => (regA "primer").s ! Posit ! AF ag.g ag.n} ; + for_Prep = mkPrep ["per a"] ; from_Prep = complGen ; --- he_Pron = mkPronoun "ell" "lo" "el" "ell" ["el seu"] ["la seva"] ["els seus"] ["les seves"] Masc Sg P3 ; - here_Adv = mkAdv "aquí" ; -- ací - here7to_Adv = mkAdv ["cap aquí"] ; - here7from_Adv = mkAdv ["de aquí"] ; + here_Adv = mkAdv "aquí" ; -- acÃŒ + here7to_Adv = mkAdv ["cap aquí"] ; + here7from_Adv = mkAdv ["d'aquí"] ; how_IAdv = ss "com" ; how8many_IDet = {s = \\g,c => prepCase c ++ genForms "quants" "quantes" ! g ; n = Pl} ; @@ -52,7 +53,7 @@ lin "jo" "em" "em" "mi" ["el meu"] ["la meva"] ["els meus"] ["les meves"] Fem Sg P1 ; - in_Prep = mkPreposition "en" ; + in_Prep = mkPrep "en" ; it_Pron = mkPronoun "ell" "lo" "el" "ell" @@ -60,14 +61,14 @@ lin Masc Sg P3 ; less_CAdv = ss "menys" ; ---- many_Det = {s = \\g,c => prepCase c ++ genForms "molts" "moltes" ! g ; n = Pl} ; - more_CAdv = ss "més" ; + more_CAdv = ss "més" ; most_Predet = {s = \\_,c => prepCase c ++ ["la majoria"] ; c = CPrep P_de} ; much_Det = {s = \\g,c => prepCase c ++ genForms "molt" "molta" ! g ; n = Sg} ; --- must_VV = mkVV (verbV (deber_6 "deber")) ; + must_VV = mkVV (verbV (haver_59 "haver")) ; -- + of_Prep no_Utt = ss "no" ; - on_Prep = mkPreposition "sobre" ; + on_Prep = mkPrep "sobre" ; --- one_Quant = {s = \\g,c => prepCase c ++ genForms "un" "una" ! g} ; - only_Predet = {s = \\_,c => prepCase c ++ "només" ; c = Nom} ; + only_Predet = {s = \\_,c => prepCase c ++ "nomÈs" ; c = Nom} ; or_Conj = {s1 = [] ; s2 = "o" ; n = Sg} ; otherwise_PConj = ss "altrament" ; part_Prep = complGen ; @@ -80,7 +81,7 @@ lin ["el seu"] ["la seva"] ["els seus"] ["les seves"] Fem Sg P3 ; so_AdA = ss "tan" ; - somebody_NP = pn2np (mkPN ["algú"] Masc) ; + somebody_NP = pn2np (mkPN ["algË™"] Masc) ; somePl_Det = {s = \\g,c => prepCase c ++ genForms "alguns" "algunes" ! g ; n = Pl} ; someSg_Det = {s = \\g,c => prepCase c ++ genForms "algun" "alguna" ! g ; n = Sg} ; something_NP = pn2np (mkPN ["quelcom"] Masc) ; @@ -91,9 +92,9 @@ lin Pl => \\g,c => prepCase c ++ genForms "aquells" "aquelles" ! g } } ; - there_Adv = mkAdv "allà" ; -- allá - there7to_Adv = mkAdv ["cap a allà"] ; - there7from_Adv = mkAdv ["d'allà"] ; + there_Adv = mkAdv "allà" ; -- all· + there7to_Adv = mkAdv ["cap a allà"] ; + there7from_Adv = mkAdv ["d'allà"] ; therefore_PConj = ss ["per tant"] ; they_Pron = mkPronoun "elles" "les" "les" "elles" @@ -105,33 +106,33 @@ lin Pl => \\g,c => prepCase c ++ genForms "aquests" "aquestes" ! g } } ; - through_Prep = mkPreposition "mitjançant" ; + through_Prep = mkPrep "mitjançant" ; too_AdA = ss "massa" ; to_Prep = complDat ; - under_Prep = mkPreposition "sota" ; + under_Prep = mkPrep "sota" ; very_AdA = ss "molt" ; --- want_VV = mkVV (verbV (querer_64 "querer")) ; + want_VV = mkVV (verbV (voler_120 "voler")) ; we_Pron = mkPronoun "nosaltres" "nos" "nos" "nosaltres" ["el nostre"] ["la nostra"] ["els nostres"] ["les nostres"] Fem Pl P1 ; - whatSg_IP = {s = \\c => prepCase c ++ ["què"] ; a = aagr Masc Sg} ; - whatPl_IP = {s = \\c => prepCase c ++ ["qué"] ; a = aagr Masc Pl} ; --- - when_IAdv = ss "quan" ; - when_Subj = ss "quan" ** {m = Indic} ; - where_IAdv = ss "on" ; - which_IQuant = {s = table { - Sg => \\g,c => prepCase c ++ "quin" ; --per fer: femení quina + whatSg_IP = {s = \\c => prepCase c ++ ["què"] ; a = aagr Masc Sg} ; + whatPl_IP = {s = \\c => prepCase c ++ ["què"] ; a = aagr Masc Pl} ; --- + when_IAdv = ss "quan" ; + when_Subj = ss "quan" ** {m = Indic} ; + where_IAdv = ss "on" ; + which_IQuant = {s = table { + Sg => \\g,c => prepCase c ++ "quin" ; --per fer: femenÃŒ quina Pl => \\g,c => prepCase c ++ "quins" } - } ; --per fer: femení quines + } ; --per fer: femenÃŒ quines whoPl_IP = {s = \\c => prepCase c ++ "qui" ; a = aagr Fem Pl} ; whoSg_IP = {s = \\c => prepCase c ++ "qui" ; a = aagr Fem Sg} ; - why_IAdv = ss ["per què"] ; - without_Prep = mkPreposition "sense" ; - with_Prep = mkPreposition "amb" ; - yes_Utt = ss "sí" ; + why_IAdv = ss ["per quË"] ; + without_Prep = mkPrep "sense" ; + with_Prep = mkPrep "amb" ; + yes_Utt = ss "sí" ; youSg_Pron = mkPronoun "tu" "et" "et" "tu" ["el teu"] ["la teva"] ["els teus"] ["les teves"] @@ -143,12 +144,11 @@ lin Fem Pl P2 ; youPol_Pron = mkPronoun - "vostè" "li" "li" "vostè" + "vosté" "li" "li" "vosté" ["el seu"] ["la seva"] ["els seus"] ["les seves"] Fem Pl P2 ; oper etConj : {s : Str ; n : MorphoCat.Number} = {s = "i" } ** {n = Pl} ; -} - +} \ No newline at end of file