diff --git a/lib/src/romanian/LexiconRon.gf b/lib/src/romanian/LexiconRon.gf index 372b13f6b..e74086a94 100644 --- a/lib/src/romanian/LexiconRon.gf +++ b/lib/src/romanian/LexiconRon.gf @@ -5,226 +5,227 @@ concrete LexiconRon of Lexicon = CatRon ** flags optimize=values ; + coding = utf8 ; lin airplane_N = mkN "avion" ; - answer_V2S = mkV2S (mkV "rãspunde") (noPrep Da) ; + answer_V2S = mkV2S (mkV "răspunde") (noPrep Da) ; apartment_N = mkN "apartament"; - apple_N = mkN "mãr"; - art_N = mkN "artã" ; - ask_V2Q = mkV2Q (v_besch29 "întreba") (noPrep Ac) ; - baby_N = mkAnim (mkN "bebeluº" masculine) ; - bad_A = mkA "rãu" "rea" "rãi" "rele" ; - bank_N = mkN "bancã" "bãnci" ; + apple_N = mkN "măr"; + art_N = mkN "artă" ; + ask_V2Q = mkV2Q (v_besch29 "întreba") (noPrep Ac) ; + baby_N = mkAnim (mkN "bebeluÅŸ" masculine) ; + bad_A = mkA "rău" "rea" "răi" "rele" ; + bank_N = mkN "bancă" "bănci" ; beautiful_A = mkRMut "frumos" ; become_VA = mkVA (v_besch136 "deveni") ; beer_N = mkN "bere" ; beg_V2V = mkV2V (v_besch48 "ruga") (noPrep Ac) (noPrep Da) ; big_A = mkA "mare" ; - bike_N = mkN "bicicletã" ; - bird_N = mkN "pasãre" "pãsãri" ; + bike_N = mkN "bicicletă" ; + bird_N = mkN "pasăre" "păsări" ; black_A = mkRMut "negru" ; blue_A = mkA "albastru" ; boat_N = mkN "vapor" neuter ; - book_N = mkN "carte" "cãrþi" ; - boot_N = mkN "cizmã" ; - boss_N = mkAnim (mkN "ºef" masculine) ; - boy_N = mkAnim (mkN "bãiat" "bãieþi") ; - bread_N = mkN "pâine"; + book_N = mkN "carte" "cărÅ£i" ; + boot_N = mkN "cizmă" ; + boss_N = mkAnim (mkN "ÅŸef" masculine) ; + boy_N = mkAnim (mkN "băiat" "băieÅ£i") ; + bread_N = mkN "pâine"; break_V2 = dirV2 (v_besch97 "sparge") ; broad_A = mkA "larg" ; brother_N2 = mkN2 (mkAnim(mkN "frate" masculine)) (noPrep Ge) ; brown_A = invarA "maro" ; butter_N = mkNR "unt"; - buy_V2 = dirV2 (v_besch35 "cumpãra"); + buy_V2 = dirV2 (v_besch35 "cumpăra"); camera_N = compN (mkN "aparat" neuter) ["foto"] ; - cap_N = mkN "ºapcã" "ºepci" ; - car_N = mkN "maºinã" ; + cap_N = mkN "ÅŸapcă" "ÅŸepci" ; + car_N = mkN "maÅŸină" ; carpet_N = mkN "covor" neuter ; - cat_N = mkN "pisicã" ; + cat_N = mkN "pisică" ; ceiling_N = mkN "plafon" ; chair_N = mkN "scaun" ; - cheese_N = mkN "brânzã" "brânzeturi" "brânze" ; + cheese_N = mkN "brânză" "brânzeturi" "brânze" ; child_N = mkAnim (mkN "copil" "copii" ) ; - church_N = mkN "bisericã" ; - city_N = mkN "oraº" ; + church_N = mkN "biserică" ; + city_N = mkN "oraÅŸ" ; clean_A = mkA "curat" ; - clever_A = mkRMut "deºtept" ; - close_V2 = dirV2 (mkV "închide") ; - coat_N = mkN "hainã" ; + clever_A = mkRMut "deÅŸtept" ; + close_V2 = dirV2 (mkV "închide") ; + coat_N = mkN "haină" ; cold_A = mkA "rece" ; come_V = v_besch136 "veni" ; computer_N = mkN "calculator" neuter ; - country_N = mkN "þarã" "þãri" ; - cousin_N = mkAnim (mkN "vãr" masculine) ; - cow_N = mkN "vacã" "vaci" ; + country_N = mkN "Å£ară" "ţări" ; + cousin_N = mkAnim (mkN "văr" masculine) ; + cow_N = mkN "vacă" "vaci" ; die_V = v_besch129 "muri" ; dirty_A = mkA "murdar" ; - distance_N3 = mkN3 (mkN "distanþã") (mkPrep "de la" Ac) (mkPrep "la" Ac) ; + distance_N3 = mkN3 (mkN "distanţă") (mkPrep "de la" Ac) (mkPrep "la" Ac) ; doctor_N = mkAnim (mkN "doctor") ; - dog_N = mkN "câine" masculine ; - door_N = mkN "uºã" "uºi" ; + dog_N = mkN "câine" masculine ; + door_N = mkN "uşă" "uÅŸi" ; drink_V2 = dirV2 (v_besch73 "bea") ; - easy_A2V = mkA2V (mkRMut "uºor") (noPrep Ac) (noPrep Ac) ; - eat_V2 = dirV2 (v_besch52 "mânca") ; + easy_A2V = mkA2V (mkRMut "uÅŸor") (noPrep Ac) (noPrep Ac) ; + eat_V2 = dirV2 (v_besch52 "mânca") ; empty_A = mkSMut "gol" ; - enemy_N = mkAnim (mkN "duºman" masculine) ; - factory_N = mkN "fabricã" ; - father_N2 = mkN2 (mkN "tatã" "taþi" masculine) (noPrep Ge); + enemy_N = mkAnim (mkN "duÅŸman" masculine) ; + factory_N = mkN "fabrică" ; + father_N2 = mkN2 (mkN "tată" "taÅ£i" masculine) (noPrep Ge); fear_VS = mkVS (v_besch100 "teme") ; fear_V2 = mmkV2 (mkRVAcc (mkV100 "teme")) (mkPrep "de" Ac) ; - find_V2 = dirV2 (mkV "gãsi") ; - fish_N = mkN "peºte" masculine ; + find_V2 = dirV2 (mkV "găsi") ; + fish_N = mkN "peÅŸte" masculine ; floor_N = mkN "podea" ; forget_V2 = dirV2 (v_besch18 "uita") ; fridge_N = mkN "frigider" ; friend_N = mkAnim (mkN "prieten") ; fruit_N = mkN "fruct" ; fun_AV = mkAV (mkA "distractiv") (noPrep Ac) ; - garden_N = mkN "gradinã" ; - girl_N = mkAnim (mkN "fatã" "fete") ; - glove_N = mkN "mãnuºã" "mãnuºi" ; + garden_N = mkN "gradină" ; + girl_N = mkAnim (mkN "fată" "fete") ; + glove_N = mkN "mănuşă" "mănuÅŸi" ; gold_N = mkNR "aur" ; -good_A = mkA "bun" "bunã" "buni" "bune" "bine" ; +good_A = mkA "bun" "bună" "buni" "bune" "bine" ; go_V = v_besch90 "merge" ; green_A = mkA "verde" ; harbour_N = mkNR "port" ; -hate_V2 = dirV2 (mkV "urî") ; -hat_N = mkN "pãlãrie" ; +hate_V2 = dirV2 (mkV "urî") ; +hat_N = mkN "pălărie" ; hear_V2 = dirV2 (v_besch127 "auzi") ; hill_N = mkNR "deal" ; hope_VS = mkVS (v_besch17 "spera") ; horse_N = mkN "cal" "cai" ; hot_A = mkA "cald" ; -house_N = mkN "casã" ; +house_N = mkN "casă" ; important_A = mkA "important" ; industry_N = mkN "industrie" ; iron_N = mkN "fier" masculine ; king_N = mkAnim (mkN "rege" masculine) ; -know_V2 = dirV2 (v_besch122 "ºti") ; -know_VS = mkVS (v_besch109 "cunoaºte") ; +know_V2 = dirV2 (v_besch122 "ÅŸti") ; +know_VS = mkVS (v_besch109 "cunoaÅŸte") ; lake_N = mkNR "lac" ; -lamp_N = mkN "lampã" "lãmpi" ; -learn_V2 = dirV2(v_besch45 "învãþa") ; +lamp_N = mkN "lampă" "lămpi" ; +learn_V2 = dirV2(v_besch45 "învăţa") ; leather_N = mkN "piele" "piei" ; -leave_V2 = dirV2 (mkV "pãrãsi") ; -like_V2 = dirV2 (v_besch71 "plãcea") ; +leave_V2 = dirV2 (mkV "părăsi") ; +like_V2 = dirV2 (v_besch71 "plăcea") ; listen_V2 = dirV2 (v_besch18 "asculta") ; -live_V = mkV "trãi" ; +live_V = mkV "trăi" ; long_A = mkA "lung" ; lose_V2 = dirV2 (v_besch113 "pierde") ; love_N = mkN "iubire" ; love_V2 = dirV2 (mkV "iubi") ; man_N = mkAnim (mkN "om" "oameni") ; -married_A2 = mkA2 (mkA "cãsãtorit") (mkPrep "cu" Ac) ; -meat_N = mkN "carne" "cãrnuri" "cãrni" ; +married_A2 = mkA2 (mkA "căsătorit") (mkPrep "cu" Ac) ; +meat_N = mkN "carne" "cărnuri" "cărni" ; milk_N = mkN "lapte" masculine ; -moon_N = mkN "lunã" "luni" ; -mother_N2 = mkN2 (chV "mamã" (mkAnim (mkN "mamã"))) (noPrep Ge) ; +moon_N = mkN "lună" "luni" ; +mother_N2 = mkN2 (chV "mamă" (mkAnim (mkN "mamă"))) (noPrep Ge) ; mountain_N = mkN "munte" masculine ; -music_N = mkN "muzicã" ; -narrow_A = mkA "îngust" ; -new_A = mkA "nou" "nouã" "noi" "noi" ; +music_N = mkN "muzică" ; +narrow_A = mkA "îngust" ; +new_A = mkA "nou" "nouă" "noi" "noi" ; newspaper_N = mkN "ziar" ; oil_N = mkNR "ulei" ; old_A = mkA "vechi" "veche" "vechi" "vechi" ; open_V2 = dirV2 (mkV "deshide") ; paint_V2A = mkV2A (mkV "picta") (noPrep Ac) (noPrep Ac) ; -paper_N = mkN "hârtie" ; +paper_N = mkN "hârtie" ; paris_PN = mkInAn(mkPN "Paris") ; -peace_N = mkN "pace" "pãci" ; +peace_N = mkN "pace" "păci" ; pen_N = mkNR "stilou" ; -planet_N = mkN "planetã" ; +planet_N = mkN "planetă" ; plastic_N = mkN "plastic" ; play_V2 = dirV2 (v_besch48 "juca") ; -policeman_N = mkAnim (mkN "poliþist" masculine) ; +policeman_N = mkAnim (mkN "poliÅ£ist" masculine) ; priest_N = mkAnim (mkN "preot" masculine) ; probable_AS = mkAS (mkA "probabil") ; -queen_N = mkAnim (mkN "reginã" "regine") ; +queen_N = mkAnim (mkN "regină" "regine") ; radio_N = mkNR "radio"; rain_V0 = mkV0 (v_besch54 "ploua") ; read_V2 = dirV2 (mkV "citi") ; -red_A = mkA "roºu" "roºie" "roºii" "roºii" ; +red_A = mkA "roÅŸu" "roÅŸie" "roÅŸii" "roÅŸii" ; religion_N = mkN "religie" ; restaurant_N = mkN "restaurant" ; river_N = mkN "fluviu" masculine ; -rock_N = mkN "piatrã" "pietre" ; -roof_N = mkNR "acoperiº"; +rock_N = mkN "piatră" "pietre" ; +roof_N = mkNR "acoperiÅŸ"; rubber_N = mkNR "cauciuc"; run_V = v_besch126 "fugi" ; say_VS = mkVS (v_besch76 "spune") ; - school_N = mkN "ºcoala" "ºcoli" ; - science_N = mkN "ºtiinþã" ; - sea_N = mkN "mare" "mãri" ; - seek_V2 = dirV2 (v_besch24 "cãuta") ; + school_N = mkN "ÅŸcoala" "ÅŸcoli" ; + science_N = mkN "ÅŸtiinţă" ; + sea_N = mkN "mare" "mări" ; + seek_V2 = dirV2 (v_besch24 "căuta") ; see_V2 = dirV2 (v_besch67 "vedea") ; sell_V3 = dirV3 (v_besch112 "vinde") ; send_V3 = dirV3 (v_besch82 "trimite") ; sheep_N = mkN "oaie" ; ship_N = mkN "vapor" neuter ; - shirt_N = mkN "cãmaºã" "cãmãºi" ; + shirt_N = mkN "cămaşă" "cămăşi" ; shoe_N = mkN "pantof" masculine ; shop_N = mkN "magazin" ; short_A = mkA "scurt" ; silver_N = mkN "argint" masculine ; - sister_N = mkAnim (mkN "sorã" "surori") ; + sister_N = mkAnim (mkN "soră" "surori") ; sleep_V = v_besch128 "dormi" ; - small_A = mkA "mic" "micã" "mici" "mici" ; - snake_N = mkN "ºarpe" "ºerpi" masculine ; - sock_N = mkN "ºosetã" ; + small_A = mkA "mic" "mică" "mici" "mici" ; + snake_N = mkN "ÅŸarpe" "ÅŸerpi" masculine ; + sock_N = mkN "ÅŸosetă" ; speak_V2 = dirV2 (mkV "vorbi") ; star_N = mkN "stea" ; - steel_N = mkNR "oþel" ; - stone_N = mkN "piatrã" "pietre" ; - stove_N = mkN "sobã" ; + steel_N = mkNR "oÅ£el" ; + stone_N = mkN "piatră" "pietre" ; + stove_N = mkN "sobă" ; student_N = mkAnim (mkN "student" masculine) ; stupid_A = mkA "stupid" ; sun_N = mkN "soare" "sori" masculine ; switch8off_V2 = dirV2 (v_besch77 "stinge") ; switch8on_V2 = dirV2 (mkV "aprinde") ; - table_N = mkN "masã" "mese" ; + table_N = mkN "masă" "mese" ; talk_V3 = mmkV3 (mkV "vorbi") (mkPrep "cu" Ac) (mkPrep "despre" Ac); teacher_N = mkAnim (mkN "profesor") ; teach_V2 = dirV2 (v_besch57 "preda") ; television_N = mkN "televiziune" ; thick_A = mkRMut "gros" ; - thin_A = mkA "subþire" ; + thin_A = mkA "subÅ£ire" ; train_N = mkNR "tren"; - travel_V = mkV "cãlãtori" ; + travel_V = mkV "călători" ; tree_N = mkN "copac" masculine ; --trousers_N = mkN "pantalon" masculine ; - ugly_A = mkA "urât" ; - understand_V2 = dirV2 (v_besch83 "înþelege") ; + ugly_A = mkA "urât" ; + understand_V2 = dirV2 (v_besch83 "înÅ£elege") ; university_N = mkN "universitate" ; village_N = mkN "sat" neuter ; - wait_V2 = dirV2 (v_besch30 "aºtepta") ; + wait_V2 = dirV2 (v_besch30 "aÅŸtepta") ; walk_V = v_besch90 "merge" ; - warm_A = mkA "cãlduþ" "cãlduþã" "cãlduþi" "cãlduþe" "cãlduros"; - war_N = mkN "rãzboi" neuter ; + warm_A = mkA "călduÅ£" "călduţă" "călduÅ£i" "călduÅ£e" "călduros"; + war_N = mkN "război" neuter ; watch_V2 = dirV2 (mkV "privi") ; - water_N = mkN "apã" ; + water_N = mkN "apă" ; white_A = mkA "alb" ; - window_N = mkN "fereastrã" "ferestre" ; + window_N = mkN "fereastră" "ferestre" ; wine_N = mkNR "vin" ; - win_V2 = dirV2 (v_besch17 "câºtiga") ; + win_V2 = dirV2 (v_besch17 "câştiga") ; woman_N = chV "femeie" (mkAnim (mkN "femeie")) ; - wonder_VQ = mkVQ (mkRVAcc (v_besch29 "întreba")) ; + wonder_VQ = mkVQ (mkRVAcc (v_besch29 "întreba")) ; wood_N = mkN "lemn" ; write_V2 = dirV2 (v_besch117 "scrie") ; yellow_A = mkA "galben" ; - young_A = mkA "tânãr" "tânãrã" "tineri" "tinere" "tinereºte" ; + young_A = mkA "tânăr" "tânără" "tineri" "tinere" "tinereÅŸte" ; do_V2 = dirV2 (v_besch115 "face") ; now_Adv = mkAdv "acum" ; already_Adv = mkAdv "deja" ; - song_N = mkN "cântec" ; - add_V3 = dirV3 (v_besch23 "adãuga") ; - number_N = mkN "numãr" ; + song_N = mkN "cântec" ; + add_V3 = dirV3 (v_besch23 "adăuga") ; + number_N = mkN "număr" ; put_V2 = dirV2 (v_besch76 "pune") ; stop_V = mkRVAcc (regV "opri") ; - jump_V = v_besch118 "sãri" ; + jump_V = v_besch118 "sări" ; - --left_Ord = mkOrd (regA "stâng") ; + --left_Ord = mkOrd (regA "stâng") ; --right_Ord = mkOrd (mkRMut "drept") ; far_Adv = mkAdv "departe" ; correct_A = mkA "corect" ; @@ -235,130 +236,130 @@ heavy_A = mkA "greu" "grea" "grei" "grele"; near_A = mkA "apropiat" ; rotten_A = mkA "stricat" ; round_A = mkA "rotund" ; -sharp_A = mkA "ascuþit" ; +sharp_A = mkA "ascuÅ£it" ; smooth_A = mkA "neted" ; straight_A = mkRMut "drept" ; wet_A = mkA "ud" ; -wide_A = mkA "adânc" ; +wide_A = mkA "adânc" ; animal_N = mkN "animal" ; - ashes_N = mkN "cenuºã" "cenuºi" ; + ashes_N = mkN "cenuşă" "cenuÅŸi" ; back_N = mkN "spate" "spate" neuter ; - bark_N = mkNR "lãtrat" ; - belly_N = mkN "pântec" ; - blood_N = mkNR "sânge" ; + bark_N = mkNR "lătrat" ; + belly_N = mkN "pântec" ; + blood_N = mkNR "sânge" ; bone_N = mkN "os" ; breast_N = mkNR "piept" ; cloud_N = mkN "nor" ; day_N = mkN "zi" feminine ; dust_N = mkNR "praf" ; ear_N = mkN "ureche" ; - earth_N = mkNR "pãmânt" ; - egg_N = mkN "ou" "ouã" neuter ; + earth_N = mkNR "pământ" ; + egg_N = mkN "ou" "ouă" neuter ; eye_N = mkN "ochi" masculine ; - fat_N = mkN "grãsime" ; - feather_N = mkN "panã" "pene" ; + fat_N = mkN "grăsime" ; + feather_N = mkN "pană" "pene" ; fingernail_N = mkN "unghie" ; fire_N = mkNR "foc" ; flower_N = mkN "floare" "flori" ; - fog_N = mkN "ceaþã" "ceþuri" "ceþi" ; + fog_N = mkN "ceaţă" "ceÅ£uri" "ceÅ£i" ; foot_N = mkN "picior" neuter ; - forest_N = mkN "pãdure" ; - grass_N = mkN "iarbã" "ierburi" "ierbi" ; + forest_N = mkN "pădure" ; + grass_N = mkN "iarbă" "ierburi" "ierbi" ; guts_N = mkN "intestin" ; - hair_N = mkN "pãr" masculine ; - hand_N = mkN "mânã" "mâini" ; + hair_N = mkN "păr" masculine ; + hand_N = mkN "mână" "mâini" ; head_N = mkN "cap" "capete" neuter ; - heart_N = mkN "inimã" ; + heart_N = mkN "inimă" ; horn_N = mkNR "corn" ; - husband_N = mkAnim (mkN "soþ" masculine) ; - ice_N = mkN "gheaþã" "gheþuri" "gheþi" ; + husband_N = mkAnim (mkN "soÅ£" masculine) ; + ice_N = mkN "gheaţă" "gheÅ£uri" "gheÅ£i" ; knee_N = mkN "genunchi" masculine ; - leaf_N = mkN "frunzã" ; + leaf_N = mkN "frunză" ; leg_N = mkN "picior" neuter ; liver_N = mkN "ficat" ; - louse_N = mkN "pãduche" masculine ; - mouth_N = mkN "gurã" ; + louse_N = mkN "păduche" masculine ; + mouth_N = mkN "gură" ; name_N = mkN "nume" "nume" neuter ; - neck_N = mkNR "gât" ; - night_N = mkN "noapte" "nopþi" ; + neck_N = mkNR "gât" ; + night_N = mkN "noapte" "nopÅ£i" ; nose_N = mkNR "nas" ; - person_N = mkAnim (mkN "persoanã") ; + person_N = mkAnim (mkN "persoană") ; rain_N = mkN "ploaie" ; road_N = mkNR "drum" ; - root_N = mkN "rãdãcinã" ; - rope_N = mkN "sfoarã" "sfori" ; - salt_N = mkN "sare" "sãruri" "sãri"; + root_N = mkN "rădăcină" ; + rope_N = mkN "sfoară" "sfori" ; + salt_N = mkN "sare" "săruri" "sări"; sand_N = mkNR "nisip" ; - seed_N = mkN "sãmânþã" "seminþe" ; + seed_N = mkN "sămânţă" "seminÅ£e" ; skin_N = mkN "piele" "pieli" "piei" ; sky_N = mkNR "cer" ; smoke_N = mkNR "fum" ; - snow_N = mkN "zãpadã" "zãpezi" ; - stick_N = mkN "bãþ" ; - tail_N = mkN "coadã" "cozi" ; -- mkN "coadã" feminine - certain kind of tails - tongue_N = mkN "limbã" "limbi"; + snow_N = mkN "zăpadă" "zăpezi" ; + stick_N = mkN "băţ" ; + tail_N = mkN "coadă" "cozi" ; -- mkN "coadă" feminine - certain kind of tails + tongue_N = mkN "limbă" "limbi"; tooth_N = mkN "dinte" masculine ; - wife_N = mkAnim (mkN "soþie"); - wind_N = mkNR "vânt" ; - wing_N = mkN "aripã" ; + wife_N = mkAnim (mkN "soÅ£ie"); + wind_N = mkNR "vânt" ; + wing_N = mkN "aripă" ; worm_N = mkN "vierme" masculine; year_N = mkN "an" masculine; - bite_V2 = dirV2 (v_besch22 "muºca") ; + bite_V2 = dirV2 (v_besch22 "muÅŸca") ; blow_V = v_besch55 "sufla" ; breathe_V = v_besch17 "respira" ; burn_V = mkV "arde" ; - count_V2 = dirV2 (v_besch35 "numãra" ) ; - cut_V2 = dirV2(v_besch14 "tãia") ; - dig_V = v_besch23 "sãpa" ; - fall_V = v_besch65 "cãdea" ; + count_V2 = dirV2 (v_besch35 "număra" ) ; + cut_V2 = dirV2(v_besch14 "tăia") ; + dig_V = v_besch23 "săpa" ; + fall_V = v_besch65 "cădea" ; fight_V2 = dirV2 (v_besch18 "lupta") ; float_V = mkV "pluti" ; flow_V = v_besch89 "curge" ; fly_V = v_besch48 "zbura" ; - freeze_V = v_besch29 "îngheþa" ; + freeze_V = v_besch29 "îngheÅ£a" ; give_V3 = dirV3 (v_besch60 "da") ; hit_V2 = dirV2 (mkV "lovi") ; - hunt_V2 = dirV2 (mkV "vâna") ; + hunt_V2 = dirV2 (mkV "vâna") ; kill_V2 = dirV2 (v_besch81 "ucide") ; - laugh_V = v_besch91 "râde" ; - lie_V = mkRVAcc (regV "întinde") ; + laugh_V = v_besch91 "râde" ; + lie_V = mkRVAcc (regV "întinde") ; play_V = mkNV (mkV48 "juca") ; pull_V2 = dirV2 (v_besch78 "trage") ; - push_V2 = dirV2 (v_besch77 "împinge") ; + push_V2 = dirV2 (v_besch77 "împinge") ; rub_V2 = dirV2 (v_besch29 "freca") ; - scratch_V2 = dirV2 (v_besch23 "scãrpina") ; + scratch_V2 = dirV2 (v_besch23 "scărpina") ; sew_V = v_besch110 "coase" ; - sing_V = v_besch18 "cânta" ; - sit_V = mkRVAcc (mkV41 "aºeza") ; + sing_V = v_besch18 "cânta" ; + sit_V = mkRVAcc (mkV41 "aÅŸeza") ; smell_V = v_besch133 "mirosi" ; spit_V = v_besch17 "scuipa" ; squeeze_V2 = dirV2 (v_besch88 "stoarce") ; - stab_V2 = dirV2 (v_besch12 "înjunghia") ; + stab_V2 = dirV2 (v_besch12 "înjunghia") ; stand_V = v_besch17 "ridica" ; suck_V2 = dirV2 (v_besch95 "suge") ; swell_V = v_besch55 "umfla" ; - swim_V = v_besch32 "înota" ; - think_V = mkV "gândi" ; + swim_V = v_besch32 "înota" ; + think_V = mkV "gândi" ; throw_V2 = dirV2 (v_besch17 "arunca") ; tie_V2 = dirV2 (v_besch29 "lega") ; - turn_V = v_besch88 "întoarce" ; + turn_V = v_besch88 "întoarce" ; vomit_V = v_besch18 "vomita" ; - wash_V2 = dirV2 (v_besch45 "spãla") ; - wipe_V2 = dirV2 (v_besch83 "ºterge") ; + wash_V2 = dirV2 (v_besch45 "spăla") ; + wipe_V2 = dirV2 (v_besch83 "ÅŸterge") ; - hold_V2 = dirV2 (v_besch108 "þine") ; - split_V2 = dirV2 (v_besch134 "despãrþi"); - -- sit_V = v_besch41 "aºeza" ; + hold_V2 = dirV2 (v_besch108 "Å£ine") ; + split_V2 = dirV2 (v_besch134 "despărÅ£i"); + -- sit_V = v_besch41 "aÅŸeza" ; -grammar_N = mkN "gramaticã" ; -language_N = mkN "limbã" "limbi" ; -rule_N = mkN "regulã" "reguli" ; +grammar_N = mkN "gramatică" ; +language_N = mkN "limbă" "limbi" ; +rule_N = mkN "regulă" "reguli" ; john_PN = mkPN "Ion" ; -question_N = mkN "întrebare" ; -ready_A = mkA "pregãtit" ; +question_N = mkN "întrebare" ; +ready_A = mkA "pregătit" ; reason_N = mkN "motiv" ; -today_Adv = mkAdv "astãzi" ; +today_Adv = mkAdv "astăzi" ; uncertain_A = mkA "nesigur" ; diff --git a/lib/src/romanian/MorphoRon.gf b/lib/src/romanian/MorphoRon.gf index 18eb6dbf9..333abe209 100644 --- a/lib/src/romanian/MorphoRon.gf +++ b/lib/src/romanian/MorphoRon.gf @@ -3,7 +3,7 @@ resource MorphoRon = ResRon ** open Prelude, Predef in { -flags optimize=noexpand ; +flags optimize=noexpand ; coding = utf8 ; --------------------------------------------------------------------------------- ------------------------------ARTICLES------------------------------------------- @@ -19,18 +19,18 @@ case of { => case last bun of { "u" => bun + "l"; "e" => bun + "le"; - "ã" => bun + "l"; + "ă" => bun + "l"; _ => bun + "ul" }; => case last bun of - {("u"|"e"|"ã" ) => bun + "lui" ; + {("u"|"e"|"ă" ) => bun + "lui" ; _ => bun + "ului" }; => case bun of { x+"u" => bun + "le"; x + "itor" => bun + "ule" ; x + ("en"|"or") => bun + "e" ; - x+("e"|"ã") => bun; + x+("e"|"ă") => bun; _ => bun + "ule" }; => buni + "i"; @@ -38,7 +38,7 @@ case of => case bun of { x + ("a"|"i") => bun + "ua"; x + "ie" => x + "ia"; - x + "ã" => x + "a"; + x + "ă" => x + "a"; _ => bun + "a" }; @@ -49,7 +49,7 @@ case of }; => case bun of - { x + "ã" => x + "o"; + { x + "ă" => x + "o"; x + "ie" => x + "io"; _ => bun + "o" }; @@ -148,9 +148,9 @@ mkNomReg : Str -> NGender -> Noun = \obiect, g -> case g of {NMasc => mkNomIrreg obiect ((mkAdjReg obiect).s ! (AF Masc Pl Indef ANomAcc)) NMasc ; NFem => case (Predef.dp 4 obiect) of - { "ai"+x+"ã" => mkNomIrreg obiect (init obiect + "e") NFem ; --always + { "ai"+x+"ă" => mkNomIrreg obiect (init obiect + "e") NFem ; --always _ => case (Predef.dp 3 obiect) of - {"i"+("c"|"n"|"m"|"p")+"ã" => mkNomIrreg obiect (init obiect + "i") NFem ; -- 60% cases frequently used words, not frequent for neological words + {"i"+("c"|"n"|"m"|"p")+"ă" => mkNomIrreg obiect (init obiect + "i") NFem ; -- 60% cases frequently used words, not frequent for neological words _ => mkNomIrreg obiect (mkFemPl obiect) NFem } }; @@ -271,14 +271,14 @@ oper adjAuriu : Str -> Adj = \s -> oper adjMuncitor : Str -> Adj = \s -> let f = Predef.tk 2 s + "oare"; pl = s + "i"; - adv = s + "eºte" + adv = s + "eÅŸte" in mkAdjSSpec s f pl f adv ; oper adjRomanesc : Str -> Adj = \s -> - let f = Predef.tk 2 s + "ascã"; - pl = Predef.tk 2 s + "ºti"; - adv = Predef.tk 2 s + "ºte" + let f = Predef.tk 2 s + "ască"; + pl = Predef.tk 2 s + "ÅŸti"; + adv = Predef.tk 2 s + "ÅŸte" in mkAdjSSpec s f pl pl adv ; @@ -288,7 +288,7 @@ oper adjMare : Str -> Adj = \s -> mkAdjSpec s s pl pl; oper adjDimin : Str -> Adj = \s -> - let f = Predef.tk 2 s + "icã"; + let f = Predef.tk 2 s + "ică"; pl = init s + "i"; plf = s + "e" in @@ -296,8 +296,8 @@ oper adjDimin : Str -> Adj = \s -> -- the phonetical mutations that occur in Romanian (Singular Masculine -> Singular Feminine) are - -- o -> oa (Ex : frumos -> frumoasã) - -- e -> ea / ie -> ia (Ex : des -> deasã) + -- o -> oa (Ex : frumos -> frumoasă) + -- e -> ea / ie -> ia (Ex : des -> deasă) -- on the last occurence of o/e in the word (usually 2rd or 3rd last letter) mkStemMutE : Str -> Str = \s -> @@ -315,13 +315,13 @@ oper adjDimin : Str -> Adj = \s -> _ => (Predef.tk 2 s) + "oa" + (last s) }; - -- another phonetical mutation is ã -> e (Ex : proaspãtã -> proaspete) + -- another phonetical mutation is ă -> e (Ex : proaspătă -> proaspete) -- Singular Feminine -> Plural Feminine - -- on the last occurence of ã -- 2nd last letter of the root + -- on the last occurence of ă -- 2nd last letter of the root mkStemMutA : Str -> Str = \s -> case (Predef.dp 2 s) of - { "ã" + x => (Predef.tk 2 s) + "e" + (last s); + { "ă" + x => (Predef.tk 2 s) + "e" + (last s); _ => s }; @@ -331,17 +331,17 @@ oper adjDimin : Str -> Adj = \s -> oper mkStemPlReg : Str -> Str = \s -> case s of -{x + ("st"|"sc"|"ºc")=> x + "ºti"; -- always -- usually the nouns/adj can end in an "u", but we eliminate that first - x + "str" => x + "ºtri"; - x + "s" => x + "ºi"; - x + "x" => x + "cºi"; - x + "xt" => x + "cºti"; +{x + ("st"|"sc"|"ÅŸc")=> x + "ÅŸti"; -- always -- usually the nouns/adj can end in an "u", but we eliminate that first + x + "str" => x + "ÅŸtri"; + x + "s" => x + "ÅŸi"; + x + "x" => x + "cÅŸi"; + x + "xt" => x + "cÅŸti"; x + "ian" => x + "ieni"; x + "ean" => x + "eni"; x + "ead" => x + "ezi"; x + ("de"|"d") => x + "zi"; - x + ("te"|"tã"|"t") => x + "þi"; - x + ("e"|"i"|"a"|"ã")=> x + "i"; + x + ("te"|"tă"|"t") => x + "Å£i"; + x + ("e"|"i"|"a"|"ă")=> x + "i"; _ => s + "i" }; --all the mutations occur always for adjectives, appart from the exception that mutate other syllables from the word @@ -364,34 +364,34 @@ mkFemSg : Str -> Str = \s -> case s of {x + "i" => s + "e"; x + "iu" => x + "ie"; - x + "u" => x + "ã"; - _ => s + "ã" + x + "u" => x + "ă"; + _ => s + "ă" }; -- obtaining the Feminine Plural from Feminine Singular for Nouns : mkFemPl : Str -> Str = \s -> case s of -{ x + "are" => x + "ãri"; --always +{ x + "are" => x + "ări"; --always x + ("ui"|"ai") => s + "e"; -- from Masc (adjectives) - x + "urã" => x + "uri"; -- always + x + "ură" => x + "uri"; -- always x + "oaie" => x + "oi"; -- almost always - x + "aie" => x + "ãi"; --always + x + "aie" => x + "ăi"; --always x + "eie" => x + "ei"; --always x + "i" => s + "le" ; --always - special cases of Feminines ending in "i" like zi = day x + "a" => x + "le"; --always - special cases of Feminines ending in "a" -- most of Turkish origine like cafea = coffee - x + "une" => x + "uni"; --always - abstract collective nouns like "naþiune" = nation, French origine - x + "ate" => x + "ãþi"; --always same as above like "libertate" = freedom-- x + "ºã" => x + "ºi"; -- 70% of cases + x + "une" => x + "uni"; --always - abstract collective nouns like "naÅ£iune" = nation, French origine + x + "ate" => x + "ăţi"; --always same as above like "libertate" = freedom-- x + "şă" => x + "ÅŸi"; -- 70% of cases x + "re" => x + "ri"; -- almost always, exception nouns ending in "oare" which are treated as special case in adjReg x + "e" => x + "i"; -- almost always for Nouns, always for Adjectives _ => case init s of { x + ("g"|"h"|"nc") => (init s) + "i"; -- always for Adjectives, almost always for Nouns (g - ending has exceptions) - x + "ãt" => x + "ete"; --always - x + "ânt" => x + "inte"; --always + x + "ăt" => x + "ete"; --always + x + "ânt" => x + "inte"; --always _ => case s of - { x + "ã" => x + "e" ; -- default -- exception occur + { x + "ă" => x + "e" ; -- default -- exception occur _ => s + "e" -- worst case } @@ -404,8 +404,8 @@ case s of mkFemAdj : Str -> Str = \s -> case s of { x + ("g"|"h"|"nc") => s + "i"; - x + "ânt" => x + "inte"; - x + "ãt" => x + "ete"; + x + "ânt" => x + "inte"; + x + "ăt" => x + "ete"; _ => s + "e" }; @@ -547,10 +547,10 @@ SVerbe : Type = VerbForm => Str ; TIndi TPSimple n p => vb.s ! (Indi PSimple n p) ; TIndi TPPerfect n p => vb.s ! (Indi PPerfect n p) ; TIndi TFutur n p => pFut ! n ! p ++ vb.s ! Inf ; - TSubjo TSPres n p => "sã" ++ vb.s ! (Subjo SPres n p) ; - TSubjo TSPast n p => "sã" ++ "fi" ++ vb.s ! (PPasse Masc Sg Indef ANomAcc) ; + TSubjo TSPres n p => "să" ++ vb.s ! (Subjo SPres n p) ; + TSubjo TSPast n p => "să" ++ "fi" ++ vb.s ! (PPasse Masc Sg Indef ANomAcc) ; TCondi n p => pCond ! n ! p ++ vb.s ! Inf ; - TImper PlP1 => "sã" ++ vb.s ! (Imper PlP1) ; + TImper PlP1 => "să" ++ vb.s ! (Imper PlP1) ; TImper p => vb.s ! (Imper p) ; TGer => vb.s ! Ger ; TPPasse g n a d => vb.s ! (PPasse g n a d) @@ -565,10 +565,10 @@ table { TIndi TPSimple n p => pronRefl ! n ! p ++ vb.s ! (Indi PSimple n p) ; TIndi TPPerfect n p => pronRefl ! n ! p ++ vb.s ! (Indi PPerfect n p) ; TIndi TFutur n p => pronRefl ! n ! p ++ pFut ! n ! p ++ vb.s ! Inf ; - TSubjo TSPres n p => "sã" ++ pronRefl ! n ! p ++ vb.s ! (Subjo SPres n p) ; - TSubjo TSPast n p => "sã" ++ pronRefl ! n ! p ++ "fi" ++ vb.s ! (PPasse Masc Sg Indef ANomAcc) ; + TSubjo TSPres n p => "să" ++ pronRefl ! n ! p ++ vb.s ! (Subjo SPres n p) ; + TSubjo TSPast n p => "să" ++ pronRefl ! n ! p ++ "fi" ++ vb.s ! (PPasse Masc Sg Indef ANomAcc) ; TCondi n p => pronReflClit ! n ! p + "-" + pCond ! n ! p ++ vb.s ! Inf ; - TImper PlP1 => "sã" ++ pronRefl ! Pl ! P1 ++ vb.s ! (Imper PlP1) ; + TImper PlP1 => "să" ++ pronRefl ! Pl ! P1 ++ vb.s ! (Imper PlP1) ; TImper PlP2 => vb.s ! (Imper PlP2) + "-"+ pronRefl ! Pl ! P2 ; TImper SgP2 => vb.s ! (Imper SgP2) + "-"+ pronRefl ! Sg ! P2 ; TGer => vb.s ! Ger + "u" + "-" + pronRefl ! Sg ! P3 ; @@ -582,8 +582,8 @@ table { -- reflexive pronouns - full form pronRefl : Number => Person => Str = -table {Sg => table {P1 => "mã" ; P2 => "te" ; P3 => "se"}; - Pl => table {P1 => "ne" ; P2 => "vã" ; P3 => "se" } +table {Sg => table {P1 => "mă" ; P2 => "te" ; P3 => "se"}; + Pl => table {P1 => "ne" ; P2 => "vă" ; P3 => "se" } }; -- reflexive pronouns - short form (clitics) @@ -639,14 +639,14 @@ oper -- vowells in Romanian - used for clitics - vocale : Str = ("a"|"e"|"i"|"u"|"ã"|"î"|"â"); + vocale : Str = ("a"|"e"|"i"|"u"|"ă"|"î"|"â"); -- phonetical mutations that occur when declining verbs : --- last ã in the word -> a +-- last ă in the word -> a modALast : Str -> Str = \root -> -if_then_Str (pbool2bool (Predef.occur "ã" (Predef.dp 2 root))) +if_then_Str (pbool2bool (Predef.occur "ă" (Predef.dp 2 root))) ((Predef.tk 2 root) + "a" + (last root)) ((Predef.tk 3 root) + "a" + (Predef.dp 2 root)); -- last u in the word -> o @@ -655,16 +655,16 @@ modU : Str -> Str = \root -> if_then_Str (pbool2bool (Predef.occur "u" (Predef.dp 2 root))) ((Predef.tk 2 root) + "o" + (last root)) ((Predef.tk 3 root) + "o" + (Predef.dp 2 root)); --- first ã in the word -> a +-- first ă in the word -> a modAFirst : Str -> Str = \root -> -if_then_Str (pbool2bool (Predef.occur "ã" (Predef.take 2 root))) +if_then_Str (pbool2bool (Predef.occur "ă" (Predef.take 2 root))) ((Predef.take 1 root) + "a" + (Predef.drop 2 root)) ((Predef.take 2 root) + "a" + (Predef.drop 3 root)); --- ã -> a (general) +-- ă -> a (general) modA : Str -> Str = \root -> - if_then_Str (pbool2bool (Predef.occur "ã" (Predef.dp 3 root))) (modALast root) (modAFirst root) ; + if_then_Str (pbool2bool (Predef.occur "ă" (Predef.dp 3 root))) (modALast root) (modAFirst root) ; -- e -> ea mutation (general) @@ -738,40 +738,40 @@ specTab : Str -> Str -> Number => Person => Str = \ploua, plouau -> --------------------------------- --for subGroups 1,13 - affixSgGr1Ez : Affixe = afixe "ez" "ezi" "eazã" ; - affixPlGr1Ez : Affixe = afixe "ãm" "aþi" "eazã" ; + affixSgGr1Ez : Affixe = afixe "ez" "ezi" "ează" ; + affixPlGr1Ez : Affixe = afixe "ăm" "aÅ£i" "ează" ; ------ --for subGroups 2-3 - affixSgGr1EzI : Affixe = afixe "ez" "ezi" "azã" ; - affixPlGr1EzI : Affixe = afixe "em" "aþi" "azã" ; + affixSgGr1EzI : Affixe = afixe "ez" "ezi" "ază" ; + affixPlGr1EzI : Affixe = afixe "em" "aÅ£i" "ază" ; ------ --for subGroup 4 affixSgGr1I : Affixe = afixe "i" "i" "e" ; - affixPlGr1I : Affixe = afixe "em" "aþi" "e"; + affixPlGr1I : Affixe = afixe "em" "aÅ£i" "e"; ------ --for subGroup 5 affixSgGr1VI : Affixe = afixe "" "" "e" ; affixPlGr1VI : Affixe = affixPlGr1I ; ------ --for subGroups 6-7 - affixSgGr1 : Affixe = afixe "" "i" "ã" ; - affixPlGr1 : Affixe = afixe "ãm" "aþi" "ã" ; + affixSgGr1 : Affixe = afixe "" "i" "ă" ; + affixPlGr1 : Affixe = afixe "ăm" "aÅ£i" "ă" ; ------ --for subGroup 8 - affixSgGr1U : Affixe = afixe "u" "i" "ã" ; + affixSgGr1U : Affixe = afixe "u" "i" "ă" ; affixPlGr1U : Affixe = affixPlGr1 ; ------ --for subGroup 9,11,12 - affixSgGr1AU : Affixe = afixe "au" "ai" "ã" ; - affixPlGr1AU : Affixe = afixe "ãm" "aþi" "au" ; + affixSgGr1AU : Affixe = afixe "au" "ai" "ă" ; + affixPlGr1AU : Affixe = afixe "ăm" "aÅ£i" "au" ; ------- --for subGroup 10 affixSgGr1EU : Affixe = afixe "au" "ei" "a" ; - affixPlGr1EU : Affixe = afixe "ãm" "aþi" "au" ; + affixPlGr1EU : Affixe = afixe "ăm" "aÅ£i" "au" ; ------- --for subGroup 14 affixSgGr1CI : Affixe = afixe "i" "i" "e" ; - affixPlGr1CI : Affixe = afixe "em" "eaþi" "e"; + affixPlGr1CI : Affixe = afixe "em" "eaÅ£i" "e"; ----- @@ -780,34 +780,34 @@ specTab : Str -> Str -> Number => Person => Str = \ploua, plouau -> ------------------------- --for subGroups 1-10 affixSgI : Affixe = afixe "am" "ai" "a" ; - affixPlI : Affixe = afixe "am" "aþi" "au" ; + affixPlI : Affixe = afixe "am" "aÅ£i" "au" ; --for subGroups 11-14 affixSgII : Affixe = afixe "eam" "eai" "ea" ; - affixPlII : Affixe = afixe "eam" "eaþi" "eau" ; + affixPlII : Affixe = afixe "eam" "eaÅ£i" "eau" ; --------------------------- --for Perfect Simple : --------------------------- --for subGroups 1, 6-10 - affixSgPS1 : Affixe = afixe "ai" "aºi" "ã" ; - affixPlPS1 : Affixe = afixe "arãm" "arãþi" "arã" ; + affixSgPS1 : Affixe = afixe "ai" "aÅŸi" "ă" ; + affixPlPS1 : Affixe = afixe "arăm" "arăţi" "ară" ; --for subGroups 2-5 - affixSgPS2 : Affixe = afixe "ai" "aºi" "e" ; - affixPlPS2 : Affixe = afixe "arãm" "arãþi" "arã" ; + affixSgPS2 : Affixe = afixe "ai" "aÅŸi" "e" ; + affixPlPS2 : Affixe = afixe "arăm" "arăţi" "ară" ; --for subGroups 11-12 - affixSgPS3 : Affixe = afixe "ui" "uºi" "u" ; - affixPlPS3 : Affixe = afixe "urãm" "urãþi" "urã" ; + affixSgPS3 : Affixe = afixe "ui" "uÅŸi" "u" ; + affixPlPS3 : Affixe = afixe "urăm" "urăţi" "ură" ; --for subGroups 13-14 - affixSgPS4 : Affixe = afixe "eai" "eaºi" "e" ; - affixPlPS4 : Affixe = afixe "earãm" "earãþi" "earã" ; + affixSgPS4 : Affixe = afixe "eai" "eaÅŸi" "e" ; + affixPlPS4 : Affixe = afixe "earăm" "earăţi" "eară" ; -------------------------- -- for Past Perfect : @@ -815,18 +815,18 @@ specTab : Str -> Str -> Number => Person => Str = \ploua, plouau -> --for subGroups 1-10 -affixSgPP : Affixe = afixe "asem" "aseºi" "ase" ; -affixPlPP : Affixe = afixe "aserãm" "aserãþi" "aserã" ; +affixSgPP : Affixe = afixe "asem" "aseÅŸi" "ase" ; +affixPlPP : Affixe = afixe "aserăm" "aserăţi" "aseră" ; --for subGroups 11-12 -affixSgPP2 : Affixe = afixe "usem" "useºi" "use" ; -affixPlPP2 : Affixe = afixe "userãm" "userãþi" "userã" ; +affixSgPP2 : Affixe = afixe "usem" "useÅŸi" "use" ; +affixPlPP2 : Affixe = afixe "userăm" "userăţi" "useră" ; --for subGroups 13-14 -affixSgPP3 : Affixe = afixe "easem" "easeºi" "ease" ; -affixPlPP3 : Affixe = afixe "easerãm" "easerãþi" "easerã" ; +affixSgPP3 : Affixe = afixe "easem" "easeÅŸi" "ease" ; +affixPlPP3 : Affixe = afixe "easerăm" "easerăţi" "easeră" ; -- functions that build a tense table for a verb : @@ -917,7 +917,7 @@ mkV6: Str -> Verbe = \lucra -> verbAffixes lucra (mkFromAffix root affixSgGr1Ez affixPlGr1Ez) (mkFromAffix root affixSgI affixPlI) (mkFromAffix root affixSgPS1 affixPlPS1) (mkFromAffix root affixSgPP affixPlPP) (root + "eze") (mkAdjReg(root + "at")) - (root + "ând") (root + "eazã") ; + (root + "ând") (root + "ează") ; mkV7 : Str -> Verbe = \crea -> @@ -930,7 +930,7 @@ mkV8 : Str -> Verbe = \parca -> verbAffixes parca (mkFromAffixes1 r root affixSgGr1Ez affixPlGr1Ez) (mkFromAffix r affixSgI affixPlI) (mkFromAffix r affixSgPS1 affixPlPS1) (mkFromAffix r affixSgPP affixPlPP) (root + "eze") (mkAdjReg (r + "at")) - (r + "ând") (root + "eazã") ; + (r + "ând") (root + "ează") ; mkV9 : Str -> Verbe = \divaga -> mkV8 divaga ; @@ -943,7 +943,7 @@ mkV10 : Str -> Verbe = \studia -> verbAffixes studia (mkFromAffix root affixSgGr1EzI affixPlGr1EzI) (mkFromAffix root affixSgI affixPlI) (mkFromAffix root affixSgPS2 affixPlPS2) (mkFromAffix root affixSgPP affixPlPP) (root + "eze") (mkAdjReg (root + "at")) - (root + "ind") (root + "azã") ; + (root + "ind") (root + "ază") ; --subGroup 3 @@ -952,7 +952,7 @@ mkV11 : Str -> Verbe = \ardeia -> verbAffixes ardeia (mkFromAffix root affixSgGr1EzI affixPlGr1EzI) (mkFromAffix root affixSgI affixPlI) (mkFromAffix root affixSgPS2 affixPlPS2) (mkFromAffix root affixSgPP affixPlPP) (root + "eze") (mkAdjReg (root + "at")) - (root + "nd") (root + "azã") ; + (root + "nd") (root + "ază") ; --subGroup 4 @@ -1008,7 +1008,7 @@ mkV17 : Str -> Verbe = \acuza -> verbAffixes acuza (mkFromAffix root affixSgGr1 affixPlGr1) (mkFromAffix root affixSgI affixPlI) (mkFromAffix root affixSgPS1 affixPlPS1) (mkFromAffix root affixSgPP affixPlPP) (root + "e") (mkAdjReg (root + "at")) - (root + "ând") (root + "ã") ; + (root + "ând") (root + "ă") ; mkV18 : Str -> Verbe = \ajuta -> let root = init ajuta ; @@ -1018,7 +1018,7 @@ in verbAffixes ajuta pres (mkFromAffix root affixSgI affixPlI) (mkFromAffix root affixSgPS1 affixPlPS1) (mkFromAffix root affixSgPP affixPlPP) (root + "e") (mkAdjReg (root + "at")) - (root + "ând") (root + "ã") ; + (root + "ând") (root + "ă") ; mkV19 : Str -> Verbe = \acorda -> @@ -1038,7 +1038,7 @@ in verbAffixes risca pres (mkFromAffix root affixSgI affixPlI) (mkFromAffix root affixSgPS1 affixPlPS1) (mkFromAffix root affixSgPP affixPlPP) newP (mkAdjReg (root + "at")) - (root + "ând") (root + "ã") ; + (root + "ând") (root + "ă") ; mkV22 : Str -> Verbe = \misca -> @@ -1051,7 +1051,7 @@ verbAffixes risca pres verbAffixes calca (mkFromAffixes1 r root affixSgGr1 affixPlGr1) (mkFromAffix root affixSgI affixPlI) (mkFromAffix root affixSgPS1 affixPlPS1) (mkFromAffix root affixSgPP affixPlPP) (r + "e") (mkAdjReg (root + "at")) - (root + "ând") (r + "ã") ; + (root + "ând") (r + "ă") ; mkV24 : Str -> Verbe = \cauta -> let root = init cauta ; @@ -1062,7 +1062,7 @@ mkV24 : Str -> Verbe = \cauta -> verbAffixes cauta pres (mkFromAffix root affixSgI affixPlI) (mkFromAffix root affixSgPS1 affixPlPS1) (mkFromAffix root affixSgPP affixPlPP) (r + "e") (mkAdjReg (root + "at")) - (root + "ând") (r + "ã") ; + (root + "ând") (r + "ă") ; mkV25 : Str -> Verbe = \lauda -> mkV24 lauda ; @@ -1082,7 +1082,7 @@ mkV28 : Str -> Verbe = \casca -> verbAffixes casca (changeP2 newF (mkFromAffixes1 r root affixSgGr1 affixPlGr1)) (mkFromAffix root affixSgI affixPlI) (mkFromAffix root affixSgPS1 affixPlPS1) (mkFromAffix root affixSgPP affixPlPP) newP (mkAdjReg (root + "at")) - (root + "ând") (r + "ã") ; + (root + "ând") (r + "ă") ; mkV29 : Str -> Verbe = \chema -> let root = init chema ; @@ -1091,17 +1091,17 @@ mkV28 : Str -> Verbe = \casca -> verbAffixes chema (mkAffixSpec1 root r affixSgGr1 affixPlGr1) (mkFromAffix root affixSgI affixPlI) (mkFromAffix root affixSgPS1 affixPlPS1) (mkFromAffix root affixSgPP affixPlPP) (root+"e") (mkAdjReg (root + "at")) - (root + "ând") (r + "ã") ; + (root + "ând") (r + "ă") ; mkV30 : Str -> Verbe = \certa -> let root = init certa ; newF = mkStemPlReg root ; - newP = mkMutE root + "ã" + newP = mkMutE root + "ă" in verbAffixes certa (mkTab root root newF newP newP affixPlGr1) (mkFromAffix root affixSgI affixPlI) (mkFromAffix root affixSgPS1 affixPlPS1) (mkFromAffix root affixSgPP affixPlPP) (root+"e") (mkAdjReg (root + "at")) - (root + "ând") newP ; + (root + "ând") newP ; mkV31 : Str -> Verbe = \toca -> let root = init toca ; @@ -1110,17 +1110,17 @@ mkV28 : Str -> Verbe = \casca -> verbAffixes toca (mkAffixSpec1 root r affixSgGr1 affixPlGr1) (mkFromAffix root affixSgI affixPlI) (mkFromAffix root affixSgPS1 affixPlPS1) (mkFromAffix root affixSgPP affixPlPP) (root+"e") (mkAdjReg (root + "at")) - (root + "ând") (r + "ã") ; + (root + "ând") (r + "ă") ; mkV32 : Str -> Verbe = \inota -> let root = init inota ; newF = mkStemPlReg root ; - newP = mkStemMutO root + "ã" + newP = mkStemMutO root + "ă" in verbAffixes inota (mkTab root root newF newP newP affixPlGr1) (mkFromAffix root affixSgI affixPlI) (mkFromAffix root affixSgPS1 affixPlPS1) (mkFromAffix root affixSgPP affixPlPP) (root+"e") (mkAdjReg (root + "at")) - (root + "ând") newP ; + (root + "ând") newP ; mkV33 : Str -> Verbe = \innoda -> mkV32 innoda ; @@ -1129,12 +1129,12 @@ mkV28 : Str -> Verbe = \casca -> let root = init improsca ; newF = mkStemPlReg root ; newS = mkStemMutO (init newF) + "e" ; - newP = mkStemMutO root + "ã" + newP = mkStemMutO root + "ă" in verbAffixes improsca (mkTab root root newF newP newP affixPlGr1) (mkFromAffix root affixSgI affixPlI) (mkFromAffix root affixSgPS1 affixPlPS1) (mkFromAffix root affixSgPP affixPlPP) newS (mkAdjReg (root + "at")) - (root + "ând") newP ; + (root + "ând") newP ; mkV35 : Str -> Verbe = \apara -> let root = init apara ; @@ -1144,29 +1144,29 @@ mkV28 : Str -> Verbe = \casca -> verbAffixes apara pres (mkFromAffix root affixSgI affixPlI) (mkFromAffix root affixSgPS1 affixPlPS1) (mkFromAffix root affixSgPP affixPlPP) (newP + "e") (mkAdjReg (root + "at")) - (root + "ând") (root + "ã") ; + (root + "ând") (root + "ă") ; mkV36 : Str -> Verbe = \semana -> let root = init semana ; newP = mkStemMutA root ; - newF = mkMutE root + "ã" + newF = mkMutE root + "ă" in verbAffixes semana (mkTab root root (newP+"i") newF newF affixPlGr1) (mkFromAffix root affixSgI affixPlI) (mkFromAffix root affixSgPS1 affixPlPS1) (mkFromAffix root affixSgPP affixPlPP) (newP + "e") (mkAdjReg (root + "at")) - (root + "ând") newF ; + (root + "ând") newF ; mkV37 : Str -> Verbe = \fremata -> let root = init fremata ; r = mkMutE root ; newC = (mkStemMutA root) + "e" ; newP = mkStemPlReg r ; - newF = r + "ã" + newF = r + "ă" in verbAffixes fremata (mkTab root r newP newF newF affixPlGr1) (mkFromAffix root affixSgI affixPlI) (mkFromAffix root affixSgPS1 affixPlPS1) (mkFromAffix root affixSgPP affixPlPP) newC (mkAdjReg (root + "at")) - (root + "ând") newF ; + (root + "ând") newF ; mkV38 : Str -> Verbe = \lepada -> mkV37 lepada ; @@ -1175,24 +1175,24 @@ mkV28 : Str -> Verbe = \casca -> let root = init scapara ; r = modAFirst root ; newP = mkStemMutA r ; - newF = r + "ã" + newF = r + "ă" in verbAffixes scapara (mkTab root r (newP + "i") newF newF affixPlGr1) (mkFromAffix root affixSgI affixPlI) (mkFromAffix root affixSgPS1 affixPlPS1) (mkFromAffix root affixSgPP affixPlPP) (newP + "e") (mkAdjReg (root + "at")) - (root + "ând") newF ; + (root + "ând") newF ; mkV40 : Str -> Verbe = \capata -> let root = init capata ; r = modAFirst root ; newC = mkStemMutA r + "e" ; newP = mkStemPlReg(mkStemMutA r) ; - newF = r + "ã" + newF = r + "ă" in verbAffixes capata (mkTab root r newP newF newF affixPlGr1) (mkFromAffix root affixSgI affixPlI) (mkFromAffix root affixSgPS1 affixPlPS1) (mkFromAffix root affixSgPP affixPlPP) newC (mkAdjReg (root + "at")) - (root + "ând") newF ; + (root + "ând") newF ; mkV41 : Str -> Verbe = \aseza -> let root = init aseza ; @@ -1201,7 +1201,7 @@ mkV28 : Str -> Verbe = \casca -> verbAffixes aseza (mkAffixSpec1 root r affixSgGr1 affixPlGr1) (mkFromAffix root affixSgI affixPlI) (mkFromAffix root affixSgPS1 affixPlPS1) (mkFromAffix root affixSgPP affixPlPP) (root+"e") (mkAdjReg (root + "at")) - (root + "ând") (r +"ã") ; + (root + "ând") (r +"ă") ; mkV42 : Str -> Verbe = \ierta -> mkV30 ierta ; @@ -1215,22 +1215,22 @@ mkV28 : Str -> Verbe = \casca -> mkV45 : Str -> Verbe = \invata -> let root = init invata ; newP = mkStemMutA root ; - r = genMut root "ã" "a" + r = genMut root "ă" "a" in - verbAffixes invata (mkTab root root (newP + "i") (r+"ã") (r+"ã") affixPlGr1) + verbAffixes invata (mkTab root root (newP + "i") (r+"ă") (r+"ă") affixPlGr1) (mkFromAffix root affixSgI affixPlI) (mkFromAffix root affixSgPS1 affixPlPS1) (mkFromAffix root affixSgPP affixPlPP) (newP +"e") (mkAdjReg (root + "at")) - (root + "ând") (r +"ã") ; + (root + "ând") (r +"ă") ; mkV46 : Str -> Verbe = \imbata -> let root = init imbata ; newP = mkStemMutA root ; - r = genMut root "ã" "a" + r = genMut root "ă" "a" in - verbAffixes imbata (mkTab root root (mkStemPlReg newP) (r+"ã") (r+"ã") affixPlGr1) + verbAffixes imbata (mkTab root root (mkStemPlReg newP) (r+"ă") (r+"ă") affixPlGr1) (mkFromAffix root affixSgI affixPlI) (mkFromAffix root affixSgPS1 affixPlPS1) (mkFromAffix root affixSgPP affixPlPP) (newP +"e") (mkAdjReg (root + "at")) - (root + "ând") (r +"ã") ; + (root + "ând") (r +"ă") ; mkV47 : Str -> Verbe = \varsa -> mkV46 varsa ; @@ -1240,10 +1240,10 @@ mkV28 : Str -> Verbe = \casca -> r1 = modU root ; r2 = mkStemMutO r1 in - verbAffixes juca (mkTab root r1 (mkStemPlReg r1) (r2+"ã") (r2+"ã") affixPlGr1) + verbAffixes juca (mkTab root r1 (mkStemPlReg r1) (r2+"ă") (r2+"ă") affixPlGr1) (mkFromAffix root affixSgI affixPlI) (mkFromAffix root affixSgPS1 affixPlPS1) (mkFromAffix root affixSgPP affixPlPP) (r2 +"e") (mkAdjReg (root + "at")) - (root + "ând") (r2 +"ã") ; + (root + "ând") (r2 +"ă") ; mkV49 : Str -> Verbe = \purta -> mkV48 purta ; @@ -1252,28 +1252,28 @@ mkV28 : Str -> Verbe = \casca -> let root = init prezenta ; r1 = genMut root "e" "i" in - verbAffixes prezenta (mkTab root r1 (mkStemPlReg r1) (r1+"ã") (r1+"ã") affixPlGr1) + verbAffixes prezenta (mkTab root r1 (mkStemPlReg r1) (r1+"ă") (r1+"ă") affixPlGr1) (mkFromAffix root affixSgI affixPlI) (mkFromAffix root affixSgPS1 affixPlPS1) (mkFromAffix root affixSgPP affixPlPP) (r1 +"e") (mkAdjReg (root + "at")) - (root + "ând") (r1 +"ã") ; + (root + "ând") (r1 +"ă") ; mkV51 : Str -> Verbe = \usca -> let root = init usca ; r = "usuc" in - verbAffixes usca (mkTab root r (r + "i") (r+"ã") (r+"ã") affixPlGr1) + verbAffixes usca (mkTab root r (r + "i") (r+"ă") (r+"ă") affixPlGr1) (mkFromAffix root affixSgI affixPlI) (mkFromAffix root affixSgPS1 affixPlPS1) (mkFromAffix root affixSgPP affixPlPP) (r +"e") (mkAdjReg (root + "at")) - (root + "ând") (r +"ã") ; + (root + "ând") (r +"ă") ; mkV52 : Str -> Verbe = \manca -> let root = init manca ; - r = "mãnânc" + r = "mănânc" in - verbAffixes manca (mkTab root r (r + "i") (r+"ã") (r+"ã") affixPlGr1) + verbAffixes manca (mkTab root r (r + "i") (r+"ă") (r+"ă") affixPlGr1) (mkFromAffix root affixSgI affixPlI) (mkFromAffix root affixSgPS1 affixPlPS1) (mkFromAffix root affixSgPP affixPlPP) (r +"e") (mkAdjReg (root + "at")) - (root + "ând") (r +"ã") ; + (root + "ând") (r +"ă") ; --subGroup 7 mkV53 : Str -> Verbe = \preceda -> @@ -1283,15 +1283,15 @@ mkV28 : Str -> Verbe = \casca -> in verbAffixes preceda (changeP2 newP (mkFromAffix root affixSgGr1 affixPlGr1)) (mkFromAffix root affixSgI affixPlI) (mkFromAffix root affixSgPS1 affixPlPS1) - (mkFromAffix root affixSgPP affixPlPP) (newC +"ã") (mkAdjReg (root + "at")) - (root + "ând") (root +"ã") ; + (mkFromAffix root affixSgPP affixPlPP) (newC +"ă") (mkAdjReg (root + "at")) + (root + "ând") (root +"ă") ; mkV54 : Str -> Verbe = \ploua -> let root = init ploua in - verbAffixes ploua (specTab (root + "ã") (root + "ã")) (specTab ploua (ploua+ "u")) - (specTab (root + "ã") (root + "arã")) (specTab (root + "ase") (root + "aserã")) - (root + "ã") (mkAdjReg (root + "at")) (root + "ând") (root + "ã") ; + verbAffixes ploua (specTab (root + "ă") (root + "ă")) (specTab ploua (ploua+ "u")) + (specTab (root + "ă") (root + "ară")) (specTab (root + "ase") (root + "aseră")) + (root + "ă") (mkAdjReg (root + "at")) (root + "ând") (root + "ă") ; --subGroup8 mkV55 : Str -> Verbe = \umbla -> @@ -1300,16 +1300,16 @@ mkV28 : Str -> Verbe = \casca -> verbAffixes umbla (mkFromAffix root affixSgGr1U affixPlGr1U) (mkFromAffix root affixSgI affixPlI) (mkFromAffix root affixSgPS1 affixPlPS1) (mkFromAffix root affixSgPP affixPlPP) (root +"e") (mkAdjReg (root + "at")) - (root + "ând") (root +"ã") ; + (root + "ând") (root +"ă") ; mkV56 : Str -> Verbe = \latra -> let root = init latra ; - r = genMut root "ã" "a" + r = genMut root "ă" "a" in verbAffixes latra (mkFromAffixes1 r root affixSgGr1U affixPlGr1U) (mkFromAffix root affixSgI affixPlI) (mkFromAffix root affixSgPS1 affixPlPS1) (mkFromAffix root affixSgPP affixPlPP) (r +"e") (mkAdjReg (root + "at")) - (root + "ând") (r +"ã") ; + (root + "ând") (r +"ă") ; --subGroup 9 @@ -1319,7 +1319,7 @@ mkV28 : Str -> Verbe = \casca -> verbAffixes reda (mkFromAffix root affixSgGr1AU affixPlGr1AU) (mkFromAffix root affixSgI affixPlI) (mkFromAffix root affixSgPS1 affixPlPS1) (mkFromAffix root affixSgPP affixPlPP) (root +"ea") (mkAdjReg (root + "at")) - (root + "ând") (root +"ã") ; + (root + "ând") (root +"ă") ; --subGroup 10 mkV58 : Str -> Verbe = \lua -> @@ -1329,27 +1329,27 @@ mkV28 : Str -> Verbe = \casca -> verbAffixes lua (mkFromAffixes1 r root affixSgGr1EU affixPlGr1EU) (mkFromAffix root affixSgI affixPlI) (mkFromAffix root affixSgPS1 affixPlPS1) (mkFromAffix root affixSgPP affixPlPP) (r +"a") (mkAdjReg (root + "at")) - (root + "ând") (r +"a") ; + (root + "ând") (r +"a") ; --subGroup 11 mkV59 : Str -> Verbe = \sta -> let root = init sta ; - r = Predef.tk 2 root + "stãt" + r = Predef.tk 2 root + "stăt" in verbAffixes sta (mkFromAffix root affixSgGr1AU affixPlGr1AU) (mkFromAffix r affixSgII affixPlII) (mkFromAffix r affixSgPS3 affixPlPS3) (mkFromAffix r affixSgPP2 affixPlPP2) (root +"ea") (mkAdjReg (root + "at")) - (root + "ând") (root +"ai") ; + (root + "ând") (root +"ai") ; --subGroups 12 mkV60 : Str -> Verbe = \da -> let root = init da ; - r = init root + "dãd" + r = init root + "dăd" in verbAffixes da (mkFromAffix root affixSgGr1AU affixPlGr1AU) (mkFromAffix r affixSgII affixPlII) (mkFromAffix r affixSgPS3 affixPlPS3) (mkFromAffix r affixSgPP2 affixPlPP2) (root +"ea") (mkAdjReg (root + "at")) - (root + "ând") (root +"ai") ; + (root + "ând") (root +"ai") ; --subGroups 13 mkV61 : Str -> Verbe = \veghea -> @@ -1358,7 +1358,7 @@ mkV28 : Str -> Verbe = \casca -> verbAffixes veghea (mkFromAffix root affixSgGr1Ez affixPlGr1Ez) (mkFromAffix root affixSgII affixPlII) (mkFromAffix root affixSgPS4 affixPlPS4) (mkFromAffix root affixSgPP3 affixPlPP3) (root +"eze") (mkAdjReg (root + "eat")) - (root + "ind") (root +"eazã") ; + (root + "ind") (root +"ează") ; --subGroups 14 mkV62 : Str -> Verbe = \deochea -> @@ -1379,15 +1379,15 @@ mkV62 : Str -> Verbe = \deochea -> --subGroup 1-2 affixSgGr21 : Affixe = afixe "" "i" "e" ; -affixPlGr21 : Affixe = afixe "em" "eþi" "" ; +affixPlGr21 : Affixe = afixe "em" "eÅ£i" "" ; --subGroup 3 affixSgGr23 : Affixe = afixe "eau" "ei" "ea" ; -affixPlGr23 : Affixe = afixe "em" "eþi" "eau" ; +affixPlGr23 : Affixe = afixe "em" "eÅ£i" "eau" ; --subGroup 4 affixSgGr24 : Affixe = afixe "eau" "ei" "ea" ; -affixPlGr24 : Affixe = afixe "em" "eþi" "" ; +affixPlGr24 : Affixe = afixe "em" "eÅ£i" "" ; ---------- --Imperf @@ -1398,7 +1398,7 @@ affixPlGr24 : Affixe = afixe "em" "e --subGroup 4 affixSgI2 : Affixe = afixe "iam" "iai" "ia" ; -affixPlI2 : Affixe = afixe "iam" "iaþi" "iau" ; +affixPlI2 : Affixe = afixe "iam" "iaÅ£i" "iau" ; --------------- --Past Simple @@ -1412,8 +1412,8 @@ affixPlI2 : Affixe = afixe "iam" "ia -- affixSgPP2 and affixPlPP2 --for subGroup 4 -affixSgPP4 : Affixe = afixe "usem" "useºi" "use" ; -affixPlPP4 : Affixe = afixe "useserãm" "useserãþi" "useserã" ; +affixSgPP4 : Affixe = afixe "usem" "useÅŸi" "use" ; +affixPlPP4 : Affixe = afixe "useserăm" "useserăţi" "useseră" ; ----------------- @@ -1422,22 +1422,22 @@ affixPlPP4 : Affixe = afixe "useser mkV64 : Str -> Verbe = \aparea -> let root = Predef.tk 2 aparea ; - r = genMut root "ã" "a" + r = genMut root "ă" "a" in verbAffixes aparea (mkFromAffixes2 r root affixSgGr21 affixPlGr21) (mkFromAffix root affixSgII affixPlII) (mkFromAffix r affixSgPS3 affixPlPS3) - (mkFromAffix r affixSgPP2 affixPlPP2) (r +"ã") (mkAdjReg (root + "ut")) - (root + "ând") (r + "i") ; + (mkFromAffix r affixSgPP2 affixPlPP2) (r +"ă") (mkAdjReg (root + "ut")) + (root + "ând") (r + "i") ; mkV65 : Str -> Verbe = \cadea -> let root = Predef.tk 2 cadea ; - r = genMut root "ã" "a"; + r = genMut root "ă" "a"; rad = init (mkStemPlReg root) in verbAffixes cadea (changeP2 (mkStemPlReg r) (mkFromAffixes2 r root affixSgGr21 affixPlGr21) ) (mkFromAffix root affixSgII affixPlII) (mkFromAffix rad affixSgPS3 affixPlPS3) - (mkFromAffix rad affixSgPP2 affixPlPP2) (r +"ã") (mkAdjReg (rad + "ut")) - (rad + "ând") (mkStemPlReg r) ; + (mkFromAffix rad affixSgPP2 affixPlPP2) (r +"ă") (mkAdjReg (rad + "ut")) + (rad + "ând") (mkStemPlReg r) ; mkV66 : Str -> Verbe = \sedea -> let root = Predef.tk 2 sedea ; @@ -1446,19 +1446,19 @@ mkV66 : Str -> Verbe = \sedea -> in verbAffixes sedea (mkTab root root (mkStemPlReg root) (r + "e") root affixPlGr21) (mkFromAffix root affixSgII affixPlII) (mkFromAffix rad affixSgPS3 affixPlPS3) - (mkFromAffix rad affixSgPP2 affixPlPP2) (r +"ã") (mkAdjReg (rad + "ut")) - (rad + "ând") (rad + "i") ; + (mkFromAffix rad affixSgPP2 affixPlPP2) (r +"ă") (mkAdjReg (rad + "ut")) + (rad + "ând") (rad + "i") ; mkV67 : Str -> Verbe = \vedea -> let root = Predef.tk 2 vedea ; - r = genMut root "e" "ã" ; + r = genMut root "e" "ă" ; newC = genMut root "e" "a" ; rad = init (mkStemPlReg r) in verbAffixes vedea (mkTab root r (mkStemPlReg root) (root + "e") r affixPlGr21) (mkFromAffix root affixSgII affixPlII) (mkFromAffix rad affixSgPS3 affixPlPS3) - (mkFromAffix rad affixSgPP2 affixPlPP2) (newC +"ã") (mkAdjReg (rad + "ut")) - (rad + "ând") (mkStemPlReg root) ; + (mkFromAffix rad affixSgPP2 affixPlPP2) (newC +"ă") (mkAdjReg (rad + "ut")) + (rad + "ând") (mkStemPlReg root) ; mkV68 : Str -> Verbe = \putea -> let root = Predef.tk 2 putea ; @@ -1467,40 +1467,40 @@ mkV68 : Str -> Verbe = \putea -> in verbAffixes putea (mkTab root r (mkStemPlReg r) (newP + "e") r affixPlGr21) (mkFromAffix root affixSgII affixPlII) (mkFromAffix root affixSgPS3 affixPlPS3) - (mkFromAffix root affixSgPP2 affixPlPP2) (newP +"ã") (mkAdjReg (root + "ut")) - (root + "ând") (mkStemPlReg r) ; + (mkFromAffix root affixSgPP2 affixPlPP2) (newP +"ă") (mkAdjReg (root + "ut")) + (root + "ând") (mkStemPlReg r) ; --subGroup 2 mkV69 : Str -> Verbe = \scadea -> let root = Predef.tk 2 scadea ; - r = genMut root "ã" "a"; + r = genMut root "ă" "a"; rad = init (mkStemPlReg root) in verbAffixes scadea (changeP2 (mkStemPlReg r) (mkFromAffixes2 r root affixSgGr21 affixPlGr21) ) (mkFromAffix root affixSgII affixPlII) (mkFromAffix rad affixSgPS3 affixPlPS3) - (mkFromAffix rad affixSgPP2 affixPlPP2) (r +"ã") (mkAdjReg (rad + "ut")) - (rad + "ând") (r + "e") ; + (mkFromAffix rad affixSgPP2 affixPlPP2) (r +"ă") (mkAdjReg (rad + "ut")) + (rad + "ând") (r + "e") ; mkV70 : Str -> Verbe = \prevedea -> let root = Predef.tk 2 prevedea ; - r = genMut root "e" "ã" ; + r = genMut root "e" "ă" ; newC = genMut root "e" "a" ; rad = init (mkStemPlReg r) in verbAffixes prevedea (mkTab root r (mkStemPlReg root) (root + "e") r affixPlGr21) (mkFromAffix root affixSgII affixPlII) (mkFromAffix rad affixSgPS3 affixPlPS3) - (mkFromAffix rad affixSgPP2 affixPlPP2) (newC +"ã") (mkAdjReg (rad + "ut")) - (rad + "ând") (root + "e") ; + (mkFromAffix rad affixSgPP2 affixPlPP2) (newC +"ă") (mkAdjReg (rad + "ut")) + (rad + "ând") (root + "e") ; mkV71 : Str -> Verbe = \placea -> let root = Predef.tk 2 placea ; - r = genMut root "ã" "a" + r = genMut root "ă" "a" in verbAffixes placea (mkFromAffixes2 r root affixSgGr21 affixPlGr21) (mkFromAffix root affixSgII affixPlII) (mkFromAffix r affixSgPS3 affixPlPS3) - (mkFromAffix r affixSgPP2 affixPlPP2) (r +"ã") (mkAdjReg (root + "ut")) - (root + "ând") (r + "e") ; + (mkFromAffix r affixSgPP2 affixPlPP2) (r +"ă") (mkAdjReg (root + "ut")) + (root + "ând") (r + "e") ; mkV72 : Str -> Verbe = \durea -> mkV68 durea ; @@ -1509,12 +1509,12 @@ mkV68 : Str -> Verbe = \putea -> mkV73 : Str -> Verbe = \bea -> let root = Predef.tk 2 bea ; - r = root + "ã" + r = root + "ă" in verbAffixes bea (mkFromAffix root affixSgGr23 affixPlGr23) (mkFromAffix root affixSgII affixPlII) (mkFromAffix r affixSgPS3 affixPlPS3) (mkFromAffix r affixSgPP2 affixPlPP2) (root +"ea") (mkAdjReg (r + "ut")) - (root + "ând") (root + "ea") ; + (root + "ând") (root + "ea") ; --subGroup 4 @@ -1525,7 +1525,7 @@ mkV68 : Str -> Verbe = \putea -> verbAffixes vrea (mkTab root (root+"eau") (root+"ei")(root +"ea") (init root + "or") affixPlGr24) (mkFromAffix r affixSgI2 affixPlI2) (mkFromAffix root affixSgPS3 affixPlPS3) (mkFromAffix root affixSgPP4 affixPlPP4) (root +"ea") (mkAdjReg (root + "ut")) - (root + "ând") (root + "ei") ; + (root + "ând") (root + "ei") ; ---------------------------------------------------------------------- -------Group 3 -- verbs ending in -e @@ -1538,7 +1538,7 @@ mkV68 : Str -> Verbe = \putea -> --subGroup 7-8 affixSgGr31 : Affixe = afixe "u" "i" "e" ; -affixPlGr31 : Affixe = afixe "em" "eþi" "u" ; +affixPlGr31 : Affixe = afixe "em" "eÅ£i" "u" ; ---------------- --Imperfect @@ -1551,8 +1551,8 @@ affixPlGr31 : Affixe = afixe "em" "e --Past Simple ---------------- --subGroups 1-4,8 -affixSgPS5 : Affixe = afixe "sei" "seºi" "se" ; -affixPlPS5 : Affixe = afixe "serãm" "serãþi" "serã" ; +affixSgPS5 : Affixe = afixe "sei" "seÅŸi" "se" ; +affixPlPS5 : Affixe = afixe "serăm" "serăţi" "seră" ; --subGroups 5-7 affixSgPS3 + affixPlPS3 @@ -1560,8 +1560,8 @@ affixPlPS5 : Affixe = afixe "ser --P Perfect --------------- --subGroups 1-4,8 -affixSgPP5 : Affixe = afixe "sesem" "seseºi" "sese" ; -affixPlPP5 : Affixe = afixe "seserãm" "seserãþi" "seserã" ; +affixSgPP5 : Affixe = afixe "sesem" "seseÅŸi" "sese" ; +affixPlPP5 : Affixe = afixe "seserăm" "seserăţi" "seseră" ; --subGroups 5-7 --affixSgPP2 and affixPlPP2 @@ -1574,8 +1574,8 @@ mkV76 : Str -> Verbe = \pune -> in verbAffixes pune (changeP2 (r+"i") (mkFromAffix root affixSgGr21 affixPlGr21) ) (mkFromAffix root affixSgII affixPlII) (mkFromAffix r affixSgPS5 affixPlPS5) - (mkFromAffix r affixSgPP5 affixPlPP5) (root +"ã") (mkAdjReg (r + "s")) - (root + "ând") (root + "e") ; + (mkFromAffix r affixSgPP5 affixPlPP5) (root +"ă") (mkAdjReg (r + "s")) + (root + "ând") (root + "e") ; mkV77 : Str -> Verbe = \atinge -> let root = init atinge ; @@ -1583,20 +1583,20 @@ mkV77 : Str -> Verbe = \atinge -> in verbAffixes atinge (mkFromAffix root affixSgGr21 affixPlGr21) (mkFromAffix root affixSgII affixPlII) (mkFromAffix r affixSgPS5 affixPlPS5) - (mkFromAffix r affixSgPP5 affixPlPP5) (root +"ã") (mkAdjReg (r + "s")) - (root + "ând") (root + "e") ; + (mkFromAffix r affixSgPP5 affixPlPP5) (root +"ă") (mkAdjReg (r + "s")) + (root + "ând") (root + "e") ; mkV78 : Str -> Verbe = \trage -> let root = init trage ; - rad1 = genMut root "a" "ã" ; + rad1 = genMut root "a" "ă" ; r = init root ; - rad2 = genMut r "a" "ã" + rad2 = genMut r "a" "ă" in verbAffixes trage (mkFromAffix root affixSgGr21 affixPlGr21) (mkFromAffix rad1 affixSgII affixPlII) - (mkTab rad2 (r + "ei") (r + "seºi") (rad2 + "e") (rad2 + "erã") affixPlPS5) - (mkFromAffix rad2 affixSgPP5 affixPlPP5) (root +"ã") (mkAdjReg (r + "s")) - (rad1 + "ând") (root + "e") ; + (mkTab rad2 (r + "ei") (r + "seÅŸi") (rad2 + "e") (rad2 + "eră") affixPlPS5) + (mkFromAffix rad2 affixSgPP5 affixPlPP5) (root +"ă") (mkAdjReg (r + "s")) + (rad1 + "ând") (root + "e") ; mkV79 : Str -> Verbe = \decide -> let root = init decide ; @@ -1604,20 +1604,20 @@ mkV79 : Str -> Verbe = \decide -> in verbAffixes decide (changeP2 (mkStemPlReg root) (mkFromAffix root affixSgGr21 affixPlGr21)) (mkFromAffix root affixSgII affixPlII) (mkFromAffix r affixSgPS5 affixPlPS5) - (mkFromAffix r affixSgPP5 affixPlPP5) (root +"ã") (mkAdjReg (r + "s")) - (r + "zând") (root + "e") ; + (mkFromAffix r affixSgPP5 affixPlPP5) (root +"ă") (mkAdjReg (r + "s")) + (r + "zând") (root + "e") ; mkV80 : Str -> Verbe = \rade -> let root = init rade ; - rad1 = genMut root "a" "ã" ; + rad1 = genMut root "a" "ă" ; r = init root ; - rad2 = genMut r "a" "ã" + rad2 = genMut r "a" "ă" in verbAffixes rade (changeP2 (mkStemPlReg root) (mkFromAffix root affixSgGr21 affixPlGr21)) (mkFromAffix rad1 affixSgII affixPlII) - (mkTab rad2 (r + "ei") (r + "seºi") (rad2 + "e") (rad2 + "erã") affixPlPS5) - (mkFromAffix rad2 affixSgPP5 affixPlPP5) (root +"ã") (mkAdjReg (r + "s")) - (rad2 + "zând") (root + "e") ; + (mkTab rad2 (r + "ei") (r + "seÅŸi") (rad2 + "e") (rad2 + "eră") affixPlPS5) + (mkFromAffix rad2 affixSgPP5 affixPlPP5) (root +"ă") (mkAdjReg (r + "s")) + (rad2 + "zând") (root + "e") ; mkV81 : Str -> Verbe = \ucide -> let root = init ucide ; @@ -1625,8 +1625,8 @@ mkV81 : Str -> Verbe = \ucide -> in verbAffixes ucide (changeP2 (mkStemPlReg root) (mkFromAffix root affixSgGr21 affixPlGr21)) (mkFromAffix root affixSgII affixPlII) (mkFromAffix r affixSgPS5 affixPlPS5) - (mkFromAffix r affixSgPP5 affixPlPP5) (root +"ã") (mkAdjReg (r + "s")) - (r + "gând") (root + "e") ; + (mkFromAffix r affixSgPP5 affixPlPP5) (root +"ă") (mkAdjReg (r + "s")) + (r + "gând") (root + "e") ; mkV82 : Str -> Verbe = \admite -> let root = init admite ; @@ -1634,8 +1634,8 @@ mkV82 : Str -> Verbe = \admite -> in verbAffixes admite (changeP2 (mkStemPlReg root) (mkFromAffix root affixSgGr21 affixPlGr21)) (mkFromAffix root affixSgII affixPlII) (mkFromAffix r affixSgPS5 affixPlPS5) - (mkFromAffix r affixSgPP5 affixPlPP5) (root +"ã") (mkAdjReg (r + "s")) - (r + "þând") (root + "e") ; + (mkFromAffix r affixSgPP5 affixPlPP5) (root +"ă") (mkAdjReg (r + "s")) + (r + "ţând") (root + "e") ; mkV83 : Str -> Verbe = \alege -> let root = init alege ; @@ -1644,8 +1644,8 @@ mkV83 : Str -> Verbe = \alege -> in verbAffixes alege (mkFromAffix root affixSgGr21 affixPlGr21) (mkFromAffix root affixSgII affixPlII) (mkFromAffix r affixSgPS5 affixPlPS5) - (mkFromAffix r affixSgPP5 affixPlPP5) (newP +"ã") (mkAdjRegE (r + "s")) - (root + "ând") (root + "e") ; + (mkFromAffix r affixSgPP5 affixPlPP5) (newP +"ă") (mkAdjRegE (r + "s")) + (root + "ând") (root + "e") ; mkV84 : Str -> Verbe = \sumete -> let root = init sumete ; @@ -1654,8 +1654,8 @@ mkV84 : Str -> Verbe = \sumete -> in verbAffixes sumete (changeP2 (mkStemPlReg root) (mkAffixSpec2 root newP affixSgGr21 affixPlGr21)) (mkFromAffix root affixSgII affixPlII) (mkFromAffix r affixSgPS5 affixPlPS5) - (mkFromAffix r affixSgPP5 affixPlPP5) (newP +"ã") (mkAdjRegE (r + "s")) - (r + "þând") (root + "e") ; + (mkFromAffix r affixSgPP5 affixPlPP5) (newP +"ă") (mkAdjRegE (r + "s")) + (r + "ţând") (root + "e") ; mkV85 : Str -> Verbe = \scoate -> let root = init scoate ; @@ -1665,9 +1665,9 @@ mkV85 : Str -> Verbe = \scoate -> in verbAffixes scoate (mkTab root r (mkStemPlReg r) scoate r affixPlGr21) (mkFromAffix r affixSgII affixPlII) - (mkTab rad1 (rad + "sei") (rad + "seºi") (rad1 + "se") (rad1 + "erã") affixPlPS5) - (mkFromAffix rad affixSgPP5 affixPlPP5) (root +"ã") (mkAdjRegO (rad + "s")) - (rad + "þând") (root + "e") ; + (mkTab rad1 (rad + "sei") (rad + "seÅŸi") (rad1 + "se") (rad1 + "eră") affixPlPS5) + (mkFromAffix rad affixSgPP5 affixPlPP5) (root +"ă") (mkAdjRegO (rad + "s")) + (rad + "ţând") (root + "e") ; mkV86 : Str -> Verbe = \roade -> @@ -1678,9 +1678,9 @@ mkV86 : Str -> Verbe = \roade -> in verbAffixes roade (mkTab root r (mkStemPlReg r) roade r affixPlGr21) (mkFromAffix r affixSgII affixPlII) - (mkTab rad1 (rad + "sei") (rad + "seºi") (rad1 + "se") (rad1 + "erã") affixPlPS5) - (mkFromAffix rad affixSgPP5 affixPlPP5) (root +"ã") (mkAdjRegO (rad + "s")) - (rad + "zând") (root + "e") ; + (mkTab rad1 (rad + "sei") (rad + "seÅŸi") (rad1 + "se") (rad1 + "eră") affixPlPS5) + (mkFromAffix rad affixSgPP5 affixPlPP5) (root +"ă") (mkAdjRegO (rad + "s")) + (rad + "zând") (root + "e") ; mkV87 : Str -> Verbe = \purcede -> @@ -1690,8 +1690,8 @@ mkV87 : Str -> Verbe = \purcede -> in verbAffixes purcede (changeP2 (mkStemPlReg root) (mkFromAffix root affixSgGr21 affixPlGr21)) (mkFromAffix root affixSgII affixPlII) (mkFromAffix r affixSgPS5 affixPlPS5) - (mkFromAffix r affixSgPP5 affixPlPP5) (newP +"ã") (mkAdjRegE (r + "s")) - (r + "zând") (root + "e") ; + (mkFromAffix r affixSgPP5 affixPlPP5) (newP +"ă") (mkAdjRegE (r + "s")) + (r + "zând") (root + "e") ; mkV88 : Str -> Verbe = \toarce -> @@ -1702,9 +1702,9 @@ mkV88 : Str -> Verbe = \toarce -> in verbAffixes toarce (mkTab root r (mkStemPlReg r) toarce r affixPlGr21) (mkFromAffix r affixSgII affixPlII) - (mkTab rad1 (rad + "sei") (rad + "seºi") (rad1 + "se") (rad1 + "erã") affixPlPS5) - (mkFromAffix rad affixSgPP5 affixPlPP5) (root +"ã") (mkAdjRegO (rad + "s")) - (rad + "când") (root + "e") ; + (mkTab rad1 (rad + "sei") (rad + "seÅŸi") (rad1 + "se") (rad1 + "eră") affixPlPS5) + (mkFromAffix rad affixSgPP5 affixPlPP5) (root +"ă") (mkAdjRegO (rad + "s")) + (rad + "când") (root + "e") ; --subGroup 2 @@ -1714,8 +1714,8 @@ mkV89 : Str -> Verbe = \curge -> in verbAffixes curge (mkFromAffix root affixSgGr21 affixPlGr21) (mkFromAffix root affixSgII affixPlII) (mkFromAffix r affixSgPS5 affixPlPS5) - (mkFromAffix r affixSgPP5 affixPlPP5) (root +"ã") (mkAdjReg (r + "s")) - (root + "ând") (root + "i") ; + (mkFromAffix r affixSgPP5 affixPlPP5) (root +"ă") (mkAdjReg (r + "s")) + (root + "ând") (root + "i") ; mkV90 : Str -> Verbe = \merge -> let root = init merge ; @@ -1724,8 +1724,8 @@ let root = init merge ; in verbAffixes merge (mkFromAffix root affixSgGr21 affixPlGr21) (mkFromAffix root affixSgII affixPlII) (mkFromAffix r affixSgPS5 affixPlPS5) - (mkFromAffix r affixSgPP5 affixPlPP5) (newP +"ã") (mkAdjRegE (r + "s")) - (root + "ând") (root + "i") ; + (mkFromAffix r affixSgPP5 affixPlPP5) (newP +"ă") (mkAdjRegE (r + "s")) + (root + "ând") (root + "i") ; mkV91 : Str -> Verbe = \ride -> let root = init ride ; @@ -1733,21 +1733,21 @@ let root = init ride ; in verbAffixes ride (changeP2 (mkStemPlReg root) (mkFromAffix root affixSgGr21 affixPlGr21)) (mkFromAffix root affixSgII affixPlII) (mkFromAffix r affixSgPS5 affixPlPS5) - (mkFromAffix r affixSgPP5 affixPlPP5) (root +"ã") (mkAdjReg (r + "s")) - (r + "zând") (mkStemPlReg root) ; + (mkFromAffix r affixSgPP5 affixPlPP5) (root +"ă") (mkAdjReg (r + "s")) + (r + "zând") (mkStemPlReg root) ; mkV92 : Str -> Verbe = \ramane -> let root = init ramane ; r = init root ; - r1 = genMut root "â" "ã" ; - r2 = genMut root "â" "a" + r1 = genMut root "â" "ă" ; + r2 = genMut root "â" "a" in verbAffixes ramane (changeP2 (r + "i") (mkFromAffix root affixSgGr21 affixPlGr21)) (mkFromAffix root affixSgII affixPlII) - (mkTab (init r2) (init r1 + "sei") (init r1 + "seºi") (init r2 + "se") (init r2 + "serã") affixPlPS5) - (mkFromAffix (init r1) affixSgPP5 affixPlPP5) (root +"ã") (mkAdjReg (init r2 + "s")) - (root + "ând") (r + "i") ; + (mkTab (init r2) (init r1 + "sei") (init r1 + "seÅŸi") (init r2 + "se") (init r2 + "seră") affixPlPS5) + (mkFromAffix (init r1) affixSgPP5 affixPlPP5) (root +"ă") (mkAdjReg (init r2 + "s")) + (root + "ând") (r + "i") ; --subGroup 3 : @@ -1757,8 +1757,8 @@ mkV93 : Str -> Verbe = \zice -> in verbAffixes zice (mkFromAffix root affixSgGr21 affixPlGr21) (mkFromAffix root affixSgII affixPlII) (mkFromAffix r affixSgPS5 affixPlPS5) - (mkFromAffix r affixSgPP5 affixPlPP5) (root +"ã") (mkAdjReg (r + "s")) - (root + "ând") r ; + (mkFromAffix r affixSgPP5 affixPlPP5) (root +"ă") (mkAdjReg (r + "s")) + (root + "ând") r ; --subGroup 4 : @@ -1767,8 +1767,8 @@ mkV94 : Str -> Verbe = \rupe -> in verbAffixes rupe (mkFromAffix root affixSgGr21 affixPlGr21) (mkFromAffix root affixSgII affixPlII) (mkFromAffix root affixSgPS5 affixPlPS5) - (mkFromAffix root affixSgPP5 affixPlPP5) (root +"ã") (mkAdjReg (root + "t")) - (root + "ând") rupe ; + (mkFromAffix root affixSgPP5 affixPlPP5) (root +"ă") (mkAdjReg (root + "t")) + (root + "ând") rupe ; mkV95 : Str -> Verbe = \frige -> let root = init frige ; @@ -1776,8 +1776,8 @@ mkV95 : Str -> Verbe = \frige -> in verbAffixes frige (mkFromAffix root affixSgGr21 affixPlGr21) (mkFromAffix root affixSgII affixPlII) (mkFromAffix r affixSgPS5 affixPlPS5) - (mkFromAffix r affixSgPP5 affixPlPP5) (root +"ã") (mkAdjReg (r + "t")) - (root + "ând") frige ; + (mkFromAffix r affixSgPP5 affixPlPP5) (root +"ă") (mkAdjReg (r + "t")) + (root + "ând") frige ; mkV96 : Str -> Verbe = \frange -> @@ -1786,20 +1786,20 @@ mkV96 : Str -> Verbe = \frange -> in verbAffixes frange (mkFromAffix root affixSgGr21 affixPlGr21) (mkFromAffix root affixSgII affixPlII) (mkFromAffix r affixSgPS5 affixPlPS5) - (mkFromAffix r affixSgPP5 affixPlPP5) (root +"ã") (mkAdjReg (r + "t")) - (root + "ând") frange ; + (mkFromAffix r affixSgPP5 affixPlPP5) (root +"ă") (mkAdjReg (r + "t")) + (root + "ând") frange ; mkV97 : Str -> Verbe = \sparge -> let root = init sparge ; r = init root ; - r1 = genMut root "a" "ã"; - r2 = genMut r "a" "ã" + r1 = genMut root "a" "ă"; + r2 = genMut r "a" "ă" in verbAffixes sparge (mkFromAffix root affixSgGr21 affixPlGr21) (mkFromAffix r1 affixSgII affixPlII) - (mkTab r2 (init r1 + "sei") (init r1 + "seºi") (r2 + "se") (r2 + "serã") affixPlPS5) - (mkFromAffix r2 affixSgPP5 affixPlPP5) (root +"ã") (mkAdjReg (r + "t")) - (r1 + "ând") sparge ; + (mkTab r2 (init r1 + "sei") (init r1 + "seÅŸi") (r2 + "se") (r2 + "seră") affixPlPS5) + (mkFromAffix r2 affixSgPP5 affixPlPP5) (root +"ă") (mkAdjReg (r + "t")) + (r1 + "ând") sparge ; mkV98 : Str -> Verbe = \fierbe -> let root = init fierbe ; @@ -1808,8 +1808,8 @@ mkV98 : Str -> Verbe = \fierbe -> in verbAffixes fierbe (mkFromAffix root affixSgGr21 affixPlGr21) (mkFromAffix root affixSgII affixPlII) (mkFromAffix r affixSgPS5 affixPlPS5) - (mkFromAffix r affixSgPP5 affixPlPP5) (r1 +"ã") (mkAdjRegE (r + "t")) - (root + "ând") fierbe ; + (mkFromAffix r affixSgPP5 affixPlPP5) (r1 +"ă") (mkAdjRegE (r + "t")) + (root + "ând") fierbe ; mkV99 : Str -> Verbe = \coace -> let root = init coace ; @@ -1818,8 +1818,8 @@ mkV99 : Str -> Verbe = \coace -> in verbAffixes coace (mkTab root r1 (r1+"i") (root+"e") r1 affixPlGr21) (mkFromAffix r affixSgII affixPlII) (mkFromAffix r1 affixSgPS5 affixPlPS5) - (mkFromAffix r1 affixSgPP5 affixPlPP5) (root +"ã") (mkAdjRegO (r1 + "t")) - (r + "ând") coace ; + (mkFromAffix r1 affixSgPP5 affixPlPP5) (root +"ă") (mkAdjRegO (r1 + "t")) + (r + "ând") coace ; --subGroup 5 : mkV100 : Str -> Verbe = \cere -> @@ -1828,8 +1828,8 @@ mkV100 : Str -> Verbe = \cere -> in verbAffixes cere (mkFromAffix root affixSgGr21 affixPlGr21) (mkFromAffix root affixSgII affixPlII) (mkFromAffix root affixSgPS3 affixPlPS3) - (mkFromAffix r affixSgPP2 affixPlPP2) (r +"ã") (mkAdjReg (root + "ut")) - (root + "ând") cere ; + (mkFromAffix r affixSgPP2 affixPlPP2) (r +"ă") (mkAdjReg (root + "ut")) + (root + "ând") cere ; mkV101 : Str -> Verbe = \crede -> @@ -1839,8 +1839,8 @@ mkV101 : Str -> Verbe = \crede -> in verbAffixes crede (changeP2 (newP + "i") (mkFromAffix root affixSgGr21 affixPlGr21)) (mkFromAffix root affixSgII affixPlII) (mkFromAffix newP affixSgPS3 affixPlPS3) - (mkFromAffix newP affixSgPP2 affixPlPP2) (r +"ã") (mkAdjReg (newP + "ut")) - (newP + "ând") crede ; + (mkFromAffix newP affixSgPP2 affixPlPP2) (r +"ă") (mkAdjReg (newP + "ut")) + (newP + "ând") crede ; mkV102 : Str -> Verbe = \tese -> let root = init tese ; @@ -1849,8 +1849,8 @@ mkV102 : Str -> Verbe = \tese -> in verbAffixes tese (changeP2 (newP + "i") (mkFromAffix root affixSgGr21 affixPlGr21)) (mkFromAffix root affixSgII affixPlII) (mkFromAffix root affixSgPS3 affixPlPS3) - (mkFromAffix root affixSgPP2 affixPlPP2) (r +"ã") (mkAdjReg (root + "ut")) - (root + "ând") tese ; + (mkFromAffix root affixSgPP2 affixPlPP2) (r +"ă") (mkAdjReg (root + "ut")) + (root + "ând") tese ; mkV103 : Str -> Verbe = \creste -> let root = init creste ; @@ -1859,40 +1859,40 @@ mkV103 : Str -> Verbe = \creste -> in verbAffixes creste (changeP1 r (mkFromAffix root affixSgGr21 affixPlGr21)) (mkFromAffix root affixSgII affixPlII) (mkFromAffix r affixSgPS3 affixPlPS3) - (mkFromAffix r affixSgPP2 affixPlPP2) (newC +"ã") (mkAdjReg (r + "ut")) - (r + "ând") creste ; + (mkFromAffix r affixSgPP2 affixPlPP2) (newC +"ă") (mkAdjReg (r + "ut")) + (r + "ând") creste ; mkV104 : Str -> Verbe = \investe -> let root = init investe ; r = Predef.tk 2 root + "sc" ; newC = mkMutE r ; - rad = genMut r "e" "ã" + rad = genMut r "e" "ă" in verbAffixes investe (changeP1 r (mkFromAffix root affixSgGr21 affixPlGr21)) (mkFromAffix root affixSgII affixPlII) (mkFromAffix rad affixSgPS3 affixPlPS3) - (mkFromAffix rad affixSgPP2 affixPlPP2) (newC +"ã") (mkAdjReg (rad + "ut")) - (rad + "ând") investe ; + (mkFromAffix rad affixSgPP2 affixPlPP2) (newC +"ă") (mkAdjReg (rad + "ut")) + (rad + "ând") investe ; mkV105 : Str -> Verbe = \bate -> let root = init bate ; - r = genMut root "a" "ã" + r = genMut root "a" "ă" in verbAffixes bate (changeP2 (mkStemPlReg root) (mkFromAffix root affixSgGr21 affixPlGr21)) (mkFromAffix r affixSgII affixPlII) (mkFromAffix r affixSgPS3 affixPlPS3) - (mkFromAffix r affixSgPP2 affixPlPP2) (root +"ã") (mkAdjReg (r + "ut")) - (r + "ând") bate ; + (mkFromAffix r affixSgPP2 affixPlPP2) (root +"ă") (mkAdjReg (r + "ut")) + (r + "ând") bate ; mkV106 : Str -> Verbe = \naste -> let root = init naste ; r = Predef.tk 2 root + "sc" ; - rad = genMut r "a" "ã" + rad = genMut r "a" "ă" in verbAffixes naste (changeP1 r (mkFromAffix root affixSgGr21 affixPlGr21)) (mkFromAffix root affixSgII affixPlII) (mkFromAffix rad affixSgPS3 affixPlPS3) - (mkFromAffix rad affixSgPP2 affixPlPP2) (r +"ã") (mkAdjReg (rad + "ut")) - (rad + "ând") naste ; + (mkFromAffix rad affixSgPP2 affixPlPP2) (r +"ă") (mkAdjReg (rad + "ut")) + (rad + "ând") naste ; --mkV107 : Str -> Verbe = \rage -> @@ -1903,8 +1903,8 @@ let root = init tine ; in verbAffixes tine (changeP2 r (mkFromAffix root affixSgGr21 affixPlGr21)) (mkFromAffix root affixSgII affixPlII) (mkFromAffix root affixSgPS3 affixPlPS3) - (mkFromAffix root affixSgPP2 affixPlPP2) (root +"ã") (mkAdjReg (root + "ut")) - (root + "ând") tine ; + (mkFromAffix root affixSgPP2 affixPlPP2) (root +"ă") (mkAdjReg (root + "ut")) + (root + "ând") tine ; mkV109 : Str -> Verbe = \cunoaste -> let root = init cunoaste ; @@ -1914,8 +1914,8 @@ let root = init cunoaste ; in verbAffixes cunoaste (mkTab root r (mkStemPlReg r) cunoaste r affixPlGr21) (mkFromAffix rad affixSgII affixPlII) (mkFromAffix r affixSgPS3 affixPlPS3) - (mkFromAffix r affixSgPP2 affixPlPP2) (newC +"ã") (mkAdjReg (r + "ut")) - (r + "ând") cunoaste ; + (mkFromAffix r affixSgPP2 affixPlPP2) (newC +"ă") (mkAdjReg (r + "ut")) + (r + "ând") cunoaste ; mkV110 : Str -> Verbe = \coase -> let root = init coase ; @@ -1924,25 +1924,25 @@ let root = init coase ; in verbAffixes coase (mkTab root r (mkStemPlReg r) coase r affixPlGr21) (mkFromAffix r affixSgII affixPlII) (mkFromAffix rad affixSgPS3 affixPlPS3) - (mkFromAffix rad affixSgPP2 affixPlPP2) (root +"ã") (mkAdjReg (rad + "ut")) - (r + "ând") coase ; + (mkFromAffix rad affixSgPP2 affixPlPP2) (root +"ă") (mkAdjReg (rad + "ut")) + (r + "ând") coase ; mkV111 : Str -> Verbe = \divide -> let root = init divide ; newP = mkStemPlReg root in verbAffixes divide (changeP2 newP (mkFromAffix root affixSgGr21 affixPlGr21)) - empty empty empty (root +"ã") (variants{}) - (root + "ând") divide ; + empty empty empty (root +"ă") (variants{}) + (root + "ând") divide ; mkV112 : Str -> Verbe = \vinde -> let root = init vinde ; - r = genMut root "i" "â" ; + r = genMut root "i" "â" ; in verbAffixes vinde (mkTab root r (mkStemPlReg root) vinde r affixPlGr21) (mkFromAffix root affixSgII affixPlII) (mkFromAffix r affixSgPS3 affixPlPS3) - (mkFromAffix r affixSgPP2 affixPlPP2) (root +"ã") (mkAdjReg (r + "ut")) - (init r + "zând") vinde ; + (mkFromAffix r affixSgPP2 affixPlPP2) (root +"ă") (mkAdjReg (r + "ut")) + (init r + "zând") vinde ; mkV113 : Str -> Verbe = \pierde -> let root = init pierde ; @@ -1951,8 +1951,8 @@ let root = init pierde ; in verbAffixes pierde (changeP2 (rad + "i") (mkFromAffix root affixSgGr21 affixPlGr21)) (mkFromAffix root affixSgII affixPlII) (mkFromAffix root affixSgPS3 affixPlPS3) - (mkFromAffix root affixSgPP2 affixPlPP2) (r +"ã") (mkAdjReg (root + "ut")) - (rad + "ând") pierde ; + (mkFromAffix root affixSgPP2 affixPlPP2) (r +"ă") (mkAdjReg (root + "ut")) + (rad + "ând") pierde ; --mkV114 : Str -> Verbe = \exige -> @@ -1961,12 +1961,12 @@ verbAffixes pierde (changeP2 (rad + "i") (mkFromAffix root affixSgGr21 affixPlGr mkV115 : Str -> Verbe = \face -> let root = init face ; - r = genMut root "a" "ã" + r = genMut root "a" "ă" in verbAffixes face (mkFromAffix root affixSgGr21 affixPlGr21) (mkFromAffix r affixSgII affixPlII) (mkFromAffix r affixSgPS3 affixPlPS3) - (mkFromAffix r affixSgPP2 affixPlPP2) (root +"ã") (mkAdjReg (r + "ut")) - (r + "ând") (init r) ; + (mkFromAffix r affixSgPP2 affixPlPP2) (root +"ă") (mkAdjReg (r + "ut")) + (r + "ând") (init r) ; --subGroup 7 mkV116 : Str -> Verbe = \umple -> let root = init umple @@ -1974,7 +1974,7 @@ let root = init umple verbAffixes umple (mkFromAffix root affixSgGr31 affixPlGr31) (mkFromAffix root affixSgI affixPlI) (mkFromAffix root affixSgPS3 affixPlPS3) (mkFromAffix root affixSgPP2 affixPlPP2) (root +"e") (mkAdjReg (root + "ut")) - (root + "ând") umple ; + (root + "ând") umple ; --subGroup 8 mkV117 : Str -> Verbe = \scrie -> @@ -1986,45 +1986,45 @@ verbAffixes scrie (mkFromAffix root affixSgGr31 affixPlGr31) (root + "ind") scrie ; ------------------------------------ ----GROUP 4 -- verbs ending in -i/-î +---GROUP 4 -- verbs ending in -i/-î ------------------------------------ -------------- --Present -------------- --subGroups 1-2 -affixSgGr41 : Affixe = afixe "esc" "eºti" "eºte" ; -affixPlGr41 : Affixe = afixe "im" "iþi" "esc" ; +affixSgGr41 : Affixe = afixe "esc" "eÅŸti" "eÅŸte" ; +affixPlGr41 : Affixe = afixe "im" "iÅ£i" "esc" ; --subGroup 3 -affixSgGr43 : Affixe = afixe "iesc" "ieºti" "ieºte" ; -affixPlGr43 : Affixe = afixe "im" "iþi" "iesc" ; +affixSgGr43 : Affixe = afixe "iesc" "ieÅŸti" "ieÅŸte" ; +affixPlGr43 : Affixe = afixe "im" "iÅ£i" "iesc" ; --subGroup 4 affixSgGr44 : Affixe = afixe "iu" "ii" "ie" ; -affixPlGr44 : Affixe = afixe "im" "iþi" "iu" ; +affixPlGr44 : Affixe = afixe "im" "iÅ£i" "iu" ; --subGroup 5 affixSgGr45 : Affixe = afixe "i" "i" "ie" ; -affixPlGr45 : Affixe = afixe "im" "iþi" "ie" ; +affixPlGr45 : Affixe = afixe "im" "iÅ£i" "ie" ; --subGroups 6 -8 affixSgGr468 : Affixe = afixe "" "i" "e" ; -affixPlGr468 : Affixe = afixe "im" "iþi" "" ; +affixPlGr468 : Affixe = afixe "im" "iÅ£i" "" ; --subGroup 9 -affixSgGr49 : Affixe = afixe "" "i" "ã" ; -affixPlGr49 : Affixe = afixe "im" "iþi" "ã" ; +affixSgGr49 : Affixe = afixe "" "i" "ă" ; +affixPlGr49 : Affixe = afixe "im" "iÅ£i" "ă" ; --subGroup 10 affixSgGr410 : Affixe = afixe "" "i" "e" ; -affixPlGr410 : Affixe = afixe "im" "iþi" "e" ; +affixPlGr410 : Affixe = afixe "im" "iÅ£i" "e" ; --subGroup 11 @@ -2033,13 +2033,13 @@ affixPlGr411 : Affixe = afixe "" "" "ie" ; --subGroup 12 -affixSgGr412 : Affixe = afixe "ãsc" "ãºti" "ãºte" ; -affixPlGr412 : Affixe = afixe "âm" "âþi" "ãsc" ; +affixSgGr412 : Affixe = afixe "ăsc" "ăşti" "ăşte" ; +affixPlGr412 : Affixe = afixe "âm" "âţi" "ăsc" ; --subGroup 13 -affixSgGr413 : Affixe = afixe "" "i" "ã" ; -affixPlGr413 : Affixe = afixe "âm" "âþi" "ã" ; +affixSgGr413 : Affixe = afixe "" "i" "ă" ; +affixPlGr413 : Affixe = afixe "âm" "âţi" "ă" ; ------------------------- @@ -2063,40 +2063,40 @@ affixPlI4 : Affixe = afixe "" "" "iau" ; --Past Simple ------------------------ --subGroups 1-3,5-10 -affixSgPS6 : Affixe = afixe "ii" "iºi" "i" ; -affixPlPS6 : Affixe = afixe "irãm" "irãþi" "irã" ; +affixSgPS6 : Affixe = afixe "ii" "iÅŸi" "i" ; +affixPlPS6 : Affixe = afixe "irăm" "irăţi" "iră" ; --subGroup 4 -affixSgPS7 : Affixe = afixe "iui" "iuºi" "iu" ; -affixPlPS7 : Affixe = afixe "iurãm" "iurãþi" "iurã" ; +affixSgPS7 : Affixe = afixe "iui" "iuÅŸi" "iu" ; +affixPlPS7 : Affixe = afixe "iurăm" "iurăţi" "iură" ; --subGroup 11 affixSgPS8 : Affixe = afixe "" "" "i" ; -affixPlPS8 : Affixe = afixe "" "" "irã" ; +affixPlPS8 : Affixe = afixe "" "" "iră" ; --subGroup 12-13 -affixSgPS9 : Affixe = afixe "âi" "âºi" "î" ; -affixPlPS9 : Affixe = afixe "ârãm" "ârãþi" "ârã" ; +affixSgPS9 : Affixe = afixe "âi" "âşi" "î" ; +affixPlPS9 : Affixe = afixe "ârăm" "ârăţi" "âră" ; ----------------------- --Past Perfect ----------------------- --subGroups 1-3,5 + 10 -affixSgPP6 : Affixe = afixe "isem" "iseºi" "ise" ; -affixPlPP6 : Affixe = afixe "iserãm" "iserãþi" "iserã" ; +affixSgPP6 : Affixe = afixe "isem" "iseÅŸi" "ise" ; +affixPlPP6 : Affixe = afixe "iserăm" "iserăţi" "iseră" ; --subGroup 4 -affixSgPP7 : Affixe = afixe "iusem" "iuseºi" "iuse" ; -affixPlPP7 : Affixe = afixe "iuserãm" "iuserãþi" "iuserã" ; +affixSgPP7 : Affixe = afixe "iusem" "iuseÅŸi" "iuse" ; +affixPlPP7 : Affixe = afixe "iuserăm" "iuserăţi" "iuseră" ; --subGroup 11 affixSgPP8 : Affixe = afixe "" "" "ise" ; -affixPlPP8 : Affixe = afixe "" "" "iserã" ; +affixPlPP8 : Affixe = afixe "" "" "iseră" ; --subGroup 12-13 -affixSgPP9 : Affixe = afixe "âsem" "âseºi" "âse" ; -affixPlPP9 : Affixe = afixe "âserãm" "âserãþi" "âserã" ; +affixSgPP9 : Affixe = afixe "âsem" "âseÅŸi" "âse" ; +affixPlPP9 : Affixe = afixe "âserăm" "âserăţi" "âseră" ; --subGroup 1 @@ -2108,24 +2108,24 @@ mkV119 : Str -> Verbe = \povesti -> in verbAffixes povesti (mkFromAffix root affixSgGr41 affixPlGr41) (mkFromAffix root affixSgII affixPlII) (mkFromAffix root affixSgPS6 affixPlPS6) - (mkFromAffix root affixSgPP6 affixPlPP6) (root +"eascã") (mkAdjReg (root + "it")) - (root + "ind") (root + "eºte") ; + (mkFromAffix root affixSgPP6 affixPlPP6) (root +"ească") (mkAdjReg (root + "it")) + (root + "ind") (root + "eÅŸte") ; --subGroup 2 mkV120 : Str -> Verbe = \pustii -> let root = init pustii in verbAffixes pustii (mkFromAffix root affixSgGr41 affixPlGr41) (mkFromAffix root affixSgI affixPlI) (mkFromAffix root affixSgPS6 affixPlPS6) - (mkFromAffix root affixSgPP6 affixPlPP6) (root +"ascã") (mkAdjReg (root + "it")) - (root + "ind") (root + "eºte") ; + (mkFromAffix root affixSgPP6 affixPlPP6) (root +"ască") (mkAdjReg (root + "it")) + (root + "ind") (root + "eÅŸte") ; --subGroup 3 mkV121 : Str -> Verbe = \locui -> let root = init locui in verbAffixes locui (mkFromAffix root affixSgGr43 affixPlGr44) (mkFromAffix root affixSgI2 affixPlI2) (mkFromAffix root affixSgPS6 affixPlPS6) - (mkFromAffix root affixSgPP6 affixPlPP6) (root +"iascã") (mkAdjReg (root + "it")) - (root + "ind") (root + "eºte") ; + (mkFromAffix root affixSgPP6 affixPlPP6) (root +"iască") (mkAdjReg (root + "it")) + (root + "ind") (root + "eÅŸte") ; --subGroup 4 mkV122 : Str -> Verbe = \sti -> let root = init sti @@ -2133,7 +2133,7 @@ in verbAffixes sti (mkFromAffix root affixSgGr44 affixPlGr44) (mkFromAffix root affixSgI2 affixPlI2) (mkFromAffix root affixSgPS7 affixPlPS7) (mkFromAffix root affixSgPP7 affixPlPP7) (root +"ie") (mkAdjReg (root + "iut")) - (root + "iind") "ºtii" ; + (root + "iind") "ÅŸtii" ; --subGroup 5 mkV123 : Str -> Verbe = \sui -> let root = init sui @@ -2168,7 +2168,7 @@ let root = init fugi in verbAffixes fugi (mkFromAffix root affixSgGr468 affixPlGr468) (mkFromAffix root affixSgII affixPlII) (mkFromAffix root affixSgPS6 affixPlPS6) - (mkFromAffix root affixSgPP6 affixPlPP6) (root +"ã") (mkAdjReg (root + "it")) + (mkFromAffix root affixSgPP6 affixPlPP6) (root +"ă") (mkAdjReg (root + "it")) (root + "ind") fugi ; mkV127 : Str -> Verbe = \auzi -> @@ -2177,7 +2177,7 @@ let root = init auzi ; in verbAffixes auzi (mkTab root r auzi (r+"e") r affixPlGr468) (mkFromAffix root affixSgII affixPlII) (mkFromAffix root affixSgPS6 affixPlPS6) - (mkFromAffix root affixSgPP6 affixPlPP6) (r +"ã") (mkAdjReg (root + "it")) + (mkFromAffix root affixSgPP6 affixPlPP6) (r +"ă") (mkAdjReg (root + "it")) (root + "ind") auzi ; mkV128 : Str -> Verbe = \dormi -> @@ -2186,7 +2186,7 @@ let root = init dormi ; in verbAffixes dormi (mkAffixSpec2 root r affixSgGr468 affixPlGr468) (mkFromAffix root affixSgII affixPlII) (mkFromAffix root affixSgPS6 affixPlPS6) - (mkFromAffix root affixSgPP6 affixPlPP6) (r +"ã") (mkAdjReg (root + "it")) + (mkFromAffix root affixSgPP6 affixPlPP6) (r +"ă") (mkAdjReg (root + "it")) (root + "ind") dormi ; mkV129 : Str -> Verbe = \muri -> @@ -2196,7 +2196,7 @@ let root = init muri ; in verbAffixes muri (mkTab root r1 (r1 + "i") (r2 + "e") r1 affixPlGr468) (mkFromAffix root affixSgII affixPlII) (mkFromAffix root affixSgPS6 affixPlPS6) - (mkFromAffix root affixSgPP6 affixPlPP6) (r2 +"ã") (mkAdjReg (root + "it")) + (mkFromAffix root affixSgPP6 affixPlPP6) (r2 +"ă") (mkAdjReg (root + "it")) (root + "ind") (r1 + "i") ; --subGroup 7 mkV130 : Str -> Verbe = \simti -> @@ -2205,7 +2205,7 @@ let root = init simti ; in verbAffixes simti (mkTab root r (mkStemPlReg r) (r+"e") r affixPlGr468) (mkFromAffix root affixSgII affixPlII) (mkFromAffix root affixSgPS6 affixPlPS6) - (mkFromAffix root affixSgPP6 affixPlPP6) (r +"ã") (mkAdjReg (root + "it")) + (mkFromAffix root affixSgPP6 affixPlPP6) (r +"ă") (mkAdjReg (root + "it")) (root + "ind") (r+"e") ; mkV131 : Str -> Verbe = \sorbi -> @@ -2214,7 +2214,7 @@ let root = init sorbi ; in verbAffixes sorbi (mkAffixSpec2 root r affixSgGr468 affixPlGr468) (mkFromAffix root affixSgII affixPlII) (mkFromAffix root affixSgPS6 affixPlPS6) - (mkFromAffix root affixSgPP6 affixPlPP6) (r +"ã") (mkAdjReg (root + "it")) + (mkFromAffix root affixSgPP6 affixPlPP6) (r +"ă") (mkAdjReg (root + "it")) (root + "ind") (r + "e") ; mkV132 : Str -> Verbe = \slobozi -> @@ -2224,7 +2224,7 @@ let root = init slobozi ; in verbAffixes slobozi (mkTab root rad root (r+"e") rad affixPlGr468) (mkFromAffix root affixSgII affixPlII) (mkFromAffix root affixSgPS6 affixPlPS6) - (mkFromAffix root affixSgPP6 affixPlPP6) (r +"ã") (mkAdjReg (root + "it")) + (mkFromAffix root affixSgPP6 affixPlPP6) (r +"ă") (mkAdjReg (root + "it")) (root + "ind") (r+"e") ; mkV133 : Str -> Verbe = \mirosi -> @@ -2233,26 +2233,26 @@ let root = init mirosi ; in verbAffixes mirosi (mkAffixSpec2 root r affixSgGr468 affixPlGr468) (mkFromAffix root affixSgII affixPlII) (mkFromAffix root affixSgPS6 affixPlPS6) - (mkFromAffix root affixSgPP6 affixPlPP6) (r +"ã") (mkAdjReg (root + "it")) + (mkFromAffix root affixSgPP6 affixPlPP6) (r +"ă") (mkAdjReg (root + "it")) (root + "ind") (r+"e") ; mkV134 : Str -> Verbe = \imparti -> let root = init imparti ; rad = init root + "t" ; - r = genMut rad "ã" "a" + r = genMut rad "ă" "a" in verbAffixes imparti (mkFromAffixes1 r root affixSgGr468 affixPlGr468) (mkFromAffix root affixSgII affixPlII) (mkFromAffix root affixSgPS6 affixPlPS6) - (mkFromAffix root affixSgPP6 affixPlPP6) (r +"ã") (mkAdjReg (root + "it")) + (mkFromAffix root affixSgPP6 affixPlPP6) (r +"ă") (mkAdjReg (root + "it")) (root + "ind") (r+"e") ; mkV118 : Str -> Verbe = \sari -> let root = init sari ; - r = genMut root "ã" "a" + r = genMut root "ă" "a" in verbAffixes sari (mkFromAffixes2 r root affixSgGr468 affixPlGr468) (mkFromAffix root affixSgII affixPlII) (mkFromAffix root affixSgPS6 affixPlPS6) - (mkFromAffix root affixSgPP6 affixPlPP6) (r +"ã") (mkAdjReg (root + "it")) + (mkFromAffix root affixSgPP6 affixPlPP6) (r +"ă") (mkAdjReg (root + "it")) (root + "ind") (r+"i") ; @@ -2263,7 +2263,7 @@ let root = init repezi ; in verbAffixes repezi (mkTab root rad repezi (rad + "e") r affixPlGr468) (mkFromAffix root affixSgII affixPlII) (mkFromAffix root affixSgPS6 affixPlPS6) - (mkFromAffix root affixSgPP6 affixPlPP6) (r +"ã") (mkAdjReg (root + "it")) + (mkFromAffix root affixSgPP6 affixPlPP6) (r +"ă") (mkAdjReg (root + "it")) (root + "ind") (rad + "e") ; --subGroup 8 @@ -2274,7 +2274,7 @@ let root = init veni ; in verbAffixes veni (mkTab root r (init r + "i") (r + "e") r affixPlGr468) (mkFromAffix root affixSgII affixPlII) (mkFromAffix root affixSgPS6 affixPlPS6) - (mkFromAffix root affixSgPP6 affixPlPP6) (r +"ã") (mkAdjReg (root + "it")) + (mkFromAffix root affixSgPP6 affixPlPP6) (r +"ă") (mkAdjReg (root + "it")) (root + "ind") (r + "o") ; --subGroup 9 mkV137 : Str -> Verbe = \oferi -> @@ -2283,16 +2283,16 @@ in verbAffixes oferi (mkFromAffix root affixSgGr49 affixPlGr49) (mkFromAffix root affixSgII affixPlII) (mkFromAffix root affixSgPS6 affixPlPS6) (mkFromAffix root affixSgPP6 affixPlPP6) (root +"e") (mkAdjReg (root + "it")) - (root + "ind") (root + "ã") ; + (root + "ind") (root + "ă") ; mkV138 : Str -> Verbe = \acoperi -> let root = init acoperi; - r = genMut root "e" "ã" + r = genMut root "e" "ă" in -verbAffixes acoperi (mkTab root r acoperi (root + "ã") (root + "ã") affixPlGr49) +verbAffixes acoperi (mkTab root r acoperi (root + "ă") (root + "ă") affixPlGr49) (mkFromAffix root affixSgII affixPlII) (mkFromAffix root affixSgPS6 affixPlPS6) (mkFromAffix root affixSgPP6 affixPlPP6) (root +"e") (mkAdjReg (root + "it")) - (root + "ind") (root + "ã") ; + (root + "ind") (root + "ă") ; --subGroup 10 mkV139 : Str -> Verbe = \bombani -> @@ -2309,7 +2309,7 @@ let root = init trebui in verbAffixes trebui (mkFromAffix root affixSgGr411 affixPlGr411) (mkFromAffix root affixSgI4 affixPlI4) (mkFromAffix root affixSgPS8 affixPlPS8) - (mkFromAffix root affixSgPP8 affixPlPP8) (root +"iascã") (mkAdjReg (root + "it")) + (mkFromAffix root affixSgPP8 affixPlPP8) (root +"iască") (mkAdjReg (root + "it")) (root + "ind") "" ; --subGroup 12 @@ -2318,8 +2318,8 @@ let root = init uri in verbAffixes uri (mkFromAffix root affixSgGr412 affixPlGr412) (mkFromAffix root affixSgI affixPlI) (mkFromAffix root affixSgPS9 affixPlPS9) - (mkFromAffix root affixSgPP9 affixPlPP9) (root +"ascã") (mkAdjReg (root + "ât")) - (root + "ând") (root + "ãºte") ; + (mkFromAffix root affixSgPP9 affixPlPP9) (root +"ască") (mkAdjReg (root + "ât")) + (root + "ând") (root + "ăşte") ; --subGroup 13 mkV142 : Str -> Verbe = \vari -> @@ -2327,8 +2327,8 @@ let root = init vari in verbAffixes vari (mkFromAffix root affixSgGr413 affixPlGr413) (mkFromAffix root affixSgI affixPlI) (mkFromAffix root affixSgPS9 affixPlPS9) - (mkFromAffix root affixSgPP9 affixPlPP9) (root +"e") (mkAdjReg (root + "ât")) - (root + "ând") (root + "ã") ; + (mkFromAffix root affixSgPP9 affixPlPP9) (root +"e") (mkAdjReg (root + "ât")) + (root + "ând") (root + "ă") ; mkV143 : Str -> Verbe = \cobori -> let root = init cobori ; @@ -2336,18 +2336,18 @@ let root = init cobori ; in verbAffixes cobori (mkAffixSpec1 root r affixSgGr413 affixPlGr413) (mkFromAffix root affixSgI affixPlI) (mkFromAffix root affixSgPS9 affixPlPS9) - (mkFromAffix root affixSgPP9 affixPlPP9) (r +"e") (mkAdjReg (root + "ât")) - (root + "ând") (r + "ã") ; + (mkFromAffix root affixSgPP9 affixPlPP9) (r +"e") (mkAdjReg (root + "ât")) + (root + "ând") (r + "ă") ; mkV144 : Str -> Verbe = \tabari -> let root = init tabari ; rad = modAFirst root ; r = mkStemPlReg rad in -verbAffixes tabari (mkTab root rad r (rad + "ã") (rad + "ã") affixPlGr413) +verbAffixes tabari (mkTab root rad r (rad + "ă") (rad + "ă") affixPlGr413) (mkFromAffix root affixSgI affixPlI) (mkFromAffix root affixSgPS9 affixPlPS9) - (mkFromAffix root affixSgPP9 affixPlPP9) (init r +"e") (mkAdjReg (root + "ât")) - (root + "ând") (rad + "ã") ; + (mkFromAffix root affixSgPP9 affixPlPP9) (init r +"e") (mkAdjReg (root + "ât")) + (root + "ând") (rad + "ă") ; --------------------------------------- @@ -2360,10 +2360,10 @@ let root = Predef.tk 2 avea in verbAffixes avea (mkTab root "am" "ai" "are" "au" affixPlGr21) (mkFromAffix root affixSgII affixPlII) (mkFromAffix root affixSgPS3 affixPlPS3) - (mkFromAffix root affixSgPP2 affixPlPP2) "aibã" (mkAdjReg (root + "ut")) - (root + "ând") "ai" ; + (mkFromAffix root affixSgPP2 affixPlPP2) "aibă" (mkAdjReg (root + "ut")) + (root + "ând") "ai" ; -}; \ No newline at end of file +}; diff --git a/lib/src/romanian/ParadigmsRon.gf b/lib/src/romanian/ParadigmsRon.gf index dd5ed040d..d570cac12 100644 --- a/lib/src/romanian/ParadigmsRon.gf +++ b/lib/src/romanian/ParadigmsRon.gf @@ -14,7 +14,7 @@ resource ParadigmsRon = CatRon, BeschRon in { - flags optimize=all ; + flags optimize=all ; coding = utf8 ; --2 Parameters -- @@ -226,14 +226,14 @@ chV s n = mkVocc n s ** {lock_N = <>}; mkSPN : Str -> N ; mkSPN s = case s of - { x + ("ã"|"e"|"a") => regN s feminine ; + { x + ("ă"|"e"|"a") => regN s feminine ; x + ("el"|"mp"|"mb"|"en"|"id"|"at"|"ete"|"ol"|"et"|"or") => regN s masculine ; _ => regN s neuter }; mkNN : Str -> Str -> N ; mkNN s ss = case s of - { x + ("ã"|"e"|"a") => mkNI s ss feminine ; + { x + ("ă"|"e"|"a") => mkNI s ss feminine ; _ => case ss of {x + "uri" => mkNI s ss neuter ; x + "e" => mkNI s ss neuter ; @@ -338,7 +338,7 @@ case s of x + "ui" => mkV121 s ; x + "ii" => mkV120 s ; x + "i" => mkV119 s ; - x + "î" => mkV141 s + x + "î" => mkV141 s }; oper mkV : Str -> V = \s -> mkNV (regV s) ; diff --git a/lib/src/romanian/ResRon.gf b/lib/src/romanian/ResRon.gf index 8fcce4b49..170d89349 100644 --- a/lib/src/romanian/ResRon.gf +++ b/lib/src/romanian/ResRon.gf @@ -3,7 +3,7 @@ resource ResRon = ParamX - [Temp,TTAnt,Tense,TPres,TPast,TFut,TCond] ** open Prelude in { -flags optimize= all ; +flags optimize= all ; coding = utf8 ; -------------------------------------------------------------------------- @@ -114,22 +114,22 @@ param oper copula : VerbPhrase = let t = table {Inf => "fi" ; - Indi Presn Sg P1 => "sunt" ; Indi Presn Sg P2 => "eºti" ; Indi Presn Sg P3 => "este" ; - Indi Presn Pl P1 => "suntem" ; Indi Presn Pl P2 => "sunteþi" ; Indi Presn Pl P3 => "sunt" ; - Indi PSimple Sg P1 => "fusei" ; Indi PSimple Sg P2 => "fuseºi" ; Indi PSimple Sg P3 => "fuse" ; - Indi PSimple Pl P1 => "fuserãm" ; Indi PSimple Pl P2 => "fuserãþi" ; Indi PSimple Pl P3 => "fuserã" ; + Indi Presn Sg P1 => "sunt" ; Indi Presn Sg P2 => "eÅŸti" ; Indi Presn Sg P3 => "este" ; + Indi Presn Pl P1 => "suntem" ; Indi Presn Pl P2 => "sunteÅ£i" ; Indi Presn Pl P3 => "sunt" ; + Indi PSimple Sg P1 => "fusei" ; Indi PSimple Sg P2 => "fuseÅŸi" ; Indi PSimple Sg P3 => "fuse" ; + Indi PSimple Pl P1 => "fuserăm" ; Indi PSimple Pl P2 => "fuserăţi" ; Indi PSimple Pl P3 => "fuseră" ; Indi Imparf Sg P1 => "eram" ; Indi Imparf Sg P2 => "erai" ; Indi Imparf Sg P3 => "era" ; - Indi Imparf Pl P1 => "eram" ; Indi Imparf Pl P2 => "eraþi" ; Indi Imparf Pl P3 => "erau" ; - Indi PPerfect Sg P1 => "fusesem" ; Indi PPerfect Sg P2 => "fuseseºi" ; Indi PPerfect Sg P3 => "fusese" ; - Indi PPerfect Pl P1 => "fusesem" ; Indi PPerfect Pl P2 => "fuseseþi" ; Indi PPerfect Pl P3 => "fuseserã" ; + Indi Imparf Pl P1 => "eram" ; Indi Imparf Pl P2 => "eraÅ£i" ; Indi Imparf Pl P3 => "erau" ; + Indi PPerfect Sg P1 => "fusesem" ; Indi PPerfect Sg P2 => "fuseseÅŸi" ; Indi PPerfect Sg P3 => "fusese" ; + Indi PPerfect Pl P1 => "fusesem" ; Indi PPerfect Pl P2 => "fuseseÅ£i" ; Indi PPerfect Pl P3 => "fuseseră" ; Subjo SPres Sg P1 => "fiu" ; Subjo SPres Sg P2 => "fii" ; Subjo SPres Sg P3 => "fie" ; - Subjo SPres Pl P1 => "fim" ; Subjo SPres Pl P2 => "fiþi" ; Subjo SPres Pl P3 => "fie" ; - Imper SgP2 => "fii" ; Imper PlP2 => "fiþi" ; Imper PlP1 => "fim" ; + Subjo SPres Pl P1 => "fim" ; Subjo SPres Pl P2 => "fiÅ£i" ; Subjo SPres Pl P3 => "fie" ; + Imper SgP2 => "fii" ; Imper PlP2 => "fiÅ£i" ; Imper PlP1 => "fim" ; Ger => "fiind"; PPasse g n a d => case of { => "fostul"; => "fost"; => "fostului"; => "fostule"; - => "foºtii"; => "foºti"; => "foºtilor"; - => "fosta"; => "fostã"; => "fostei"; => "foste"; => "fosto"; => "fostã"; + => "foÅŸtii"; => "foÅŸti"; => "foÅŸtilor"; + => "fosta"; => "fostă"; => "fostei"; => "foste"; => "fosto"; => "fostă"; => "fostele"; => "foste"; => "fostelor" } } in @@ -143,19 +143,19 @@ oper -- auxiliary for Past Tense : pComp : Number => Person => Str = table {Sg => table {P1 => "am" ; P2 => "ai" ; P3 => "a"} ; - Pl => table {P1 => "am" ; P2 => "aþi"; P3 => "au"} + Pl => table {P1 => "am" ; P2 => "aÅ£i"; P3 => "au"} }; -- auxiliary for Future Simple : pFut : Number => Person => Str = table {Sg => table {P1 => "voi" ; P2 => "vei" ; P3 => "va"} ; - Pl => table {P1 => "vom" ; P2 => "veþi"; P3 => "vor"} + Pl => table {P1 => "vom" ; P2 => "veÅ£i"; P3 => "vor"} }; --auxiliary for Condional Present : - pCond : Number => Person => Str = table {Sg => table {P1 => "aº" ; P2 => "ai" ; P3 => "ar"} ; - Pl => table {P1 => "am" ; P2 => "aþi"; P3 => "ar"} + pCond : Number => Person => Str = table {Sg => table {P1 => "aÅŸ" ; P2 => "ai" ; P3 => "ar"} ; + Pl => table {P1 => "am" ; P2 => "aÅ£i"; P3 => "ar"} }; -- short form of the verb, conjunctive present, without the auxiliary @@ -194,22 +194,22 @@ oper s = table { VPFinite tm Simul => case tm of {VPres Indic => vf "" (\a -> verb ! Indi Presn a.n a.p) ; - VPres Conjunct => vf "sã" (\a -> verb ! Subjo SPres a.n a.p) ; + VPres Conjunct => vf "să" (\a -> verb ! Subjo SPres a.n a.p) ; VImperff => vf "" (\a -> verb ! Indi Imparf a.n a.p) ; VPasse Indic => vf "" (\a -> pComp ! a.n ! a.p ++ verb ! PPasse Masc Sg Indef ANomAcc) ; - VPasse Conjunct => vf "sã" (\a -> copula.s! Inf ++ verb ! PPasse Masc Sg Indef ANomAcc) ; + VPasse Conjunct => vf "să" (\a -> copula.s! Inf ++ verb ! PPasse Masc Sg Indef ANomAcc) ; VFut => vf "" (\a -> pFut ! a.n ! a.p ++ verb ! Inf) ; VCondit => vf "" (\a -> pCond ! a.n ! a.p ++ verb ! Inf) } ; VPFinite tm Anter => case tm of {VPres Indic => vf "" (\a -> pComp ! a.n ! a.p ++ verb ! PPasse Masc Sg Indef ANomAcc) ; - (VPres Conjunct | VPasse Conjunct) => vf "sã" (\a -> copula.s! Inf ++ verb ! PPasse Masc Sg Indef ANomAcc) ; + (VPres Conjunct | VPasse Conjunct) => vf "să" (\a -> copula.s! Inf ++ verb ! PPasse Masc Sg Indef ANomAcc) ; VFut => vf "" (\a -> pFut !a.n ! a.p ++ copula.s! Inf ++ verb ! PPasse Masc Sg Indef ANomAcc) ; VCondit => vf "" (\a -> pCond ! a.n ! a.p ++ copula.s ! Inf ++ verb ! PPasse Masc Sg Indef ANomAcc); _ => vf "" (\a -> verb ! Indi PPerfect a.n a.p) }; VPInfinit Anter b=> vf "a" (\a -> copula.s ! Inf ++ verb ! PPasse Masc Sg Indef ANomAcc); - VPImperat => vf "sã" (\a -> verb ! Subjo SPres a.n a.p) ; -- fix it later ! + VPImperat => vf "să" (\a -> verb ! Subjo SPres a.n a.p) ; -- fix it later ! VPGerund => vf "" (\a -> vger) ; VPInfinit Simul b => vf "a" (\a -> verb ! Inf) } ; @@ -377,23 +377,23 @@ oper dRefl : Agr -> RAgr = \a -> case of - {<_,_,P3> => {s = (genClit "îºi" "-ºi" "ºi" "").s } ; + {<_,_,P3> => {s = (genClit "îşi" "-ÅŸi" "ÅŸi" "").s } ; _ => {s = (cliticsDa a.g a.n a.p).s } }; cliticsAc : Gender -> Number -> Person -> {s: Clitics => Str} = \g,n,p -> case of - {<_,Sg,P1> => genClit "mã" "m-" "mã" "-mã"; <_,Pl,P1> => genClit "ne" "ne-" "ne" "-ne"; - <_,Sg,P2> => genClit "te" "te-" "te" "-te"; <_,Pl,P2> => genClit "vã" "v-" "vã" "-vã"; - => genClit "îl" "l-" "-l" "-l"; => genClit "îi" "i-" "-i" "-i"; + {<_,Sg,P1> => genClit "mă" "m-" "mă" "-mă"; <_,Pl,P1> => genClit "ne" "ne-" "ne" "-ne"; + <_,Sg,P2> => genClit "te" "te-" "te" "-te"; <_,Pl,P2> => genClit "vă" "v-" "vă" "-vă"; + => genClit "îl" "l-" "-l" "-l"; => genClit "îi" "i-" "-i" "-i"; => genClit "o" "-o" "-o" "-o"; => genClit "le" "le-" "le" "-le" }; cliticsDa : Gender -> Number -> Person -> {s : Clitics => Str} = \g,n,p -> case of - {<_,Sg,P1> => genClit "îmi" "mi-" "mi" "-mi"; <_,Pl,P1> => genClit "ne" "ne-" "ni" "-ne"; - <_,Sg,P2> => genClit "îþi" "þi-" "þi" "-þi"; <_,Pl,P2> => genClit "vã" "v-" "vi" "-vã"; - <_,Sg,P3> => genClit "îi" "i-" "i" "-i"; <_,Pl,P3> => genClit "le" "le-" "li" "-le" + {<_,Sg,P1> => genClit "îmi" "mi-" "mi" "-mi"; <_,Pl,P1> => genClit "ne" "ne-" "ni" "-ne"; + <_,Sg,P2> => genClit "îţi" "Å£i-" "Å£i" "-Å£i"; <_,Pl,P2> => genClit "vă" "v-" "vi" "-vă"; + <_,Sg,P3> => genClit "îi" "i-" "i" "-i"; <_,Pl,P3> => genClit "le" "le-" "li" "-le" }; @@ -445,7 +445,7 @@ oper artUndef : Gender -> Number -> NCase -> Str = \g,n,a -> case of { => "un"; => "un" ; => "unui"; => "unui" ;<_,_,Vo> => "" ; - <_,Pl,No> => "niºte"; <_,Pl,Ac> => "niºte"; <_,Pl,Da> => "unor"; <_,Pl,Ge> => "unor" ; + <_,Pl,No> => "niÅŸte"; <_,Pl,Ac> => "niÅŸte"; <_,Pl,Da> => "unor"; <_,Pl,Ge> => "unor" ; => "o"; => "o"; => "unei"; => "unei" }; @@ -471,20 +471,20 @@ oper reflPron : Number -> Person -> ACase -> Str = \n,p,c -> case of { => "mie" ; => "mine"; - => "þie" ; => "tine"; - <_,P3,AGenDat> => "sieºi" ; <_,P3,_> => "sine" ; - => "nouã" ; => "noi" ; - => "vouã" ; => "voi" + => "Å£ie" ; => "tine"; + <_,P3,AGenDat> => "sieÅŸi" ; <_,P3,_> => "sine" ; + => "nouă" ; => "noi" ; + => "vouă" ; => "voi" }; reflPronHard : Gender -> Number -> Person -> Str = \g,n,p -> case of - { => "însumi" ; => "însãmi"; - => "însuþi" ; => "însãþi"; - => "însuºi" ; => "însãºi"; - => "înºine" ; => "însene"; - => "înºivã"; => "înseva"; - => "înºiºi"; => "înseºi"}; + { => "însumi" ; => "însămi"; + => "însuÅ£i" ; => "însăţi"; + => "însuÅŸi" ; => "însăşi"; + => "înÅŸine" ; => "însene"; + => "înÅŸivă"; => "înseva"; + => "înÅŸiÅŸi"; => "înseÅŸi"}; -- Agreements : diff --git a/lib/src/romanian/StructuralRon.gf b/lib/src/romanian/StructuralRon.gf index 663eafb52..4c12e223a 100644 --- a/lib/src/romanian/StructuralRon.gf +++ b/lib/src/romanian/StructuralRon.gf @@ -4,76 +4,76 @@ concrete StructuralRon of Structural = CatRon ** open MorphoRon, ParadigmsRon, BeschRon, Prelude,(X = ConstructX) in { flags optimize=all ; - --coding=utf8 ; + coding=utf8 ; lin above_Prep = mkPrep "deasupra" Ge ; - after_Prep = mkPrep "dupã" Ac True; + after_Prep = mkPrep "după" Ac True; all_Predet = { s = \\a => table { AGenDat => aagrForms nonExist nonExist "tuturor" "tuturor" ! a ; - _ => aagrForms "tot" "toatã" "toþi" "toate" ! a + _ => aagrForms "tot" "toată" "toÅ£i" "toate" ! a }; c = No } ; almost_AdA, almost_AdN = ss "aproape" ; always_AdV = ss "mereu" ; - although_Subj = ss "deºi" ; - and_Conj = {s1 = [] ; s2 = "ºi" ; n = Pl} ; + although_Subj = ss "deÅŸi" ; + and_Conj = {s1 = [] ; s2 = "ÅŸi" ; n = Pl} ; because_Subj = ss "deoarece" ; - before_Prep = mkPrep "înaintea" Ge ; - behind_Prep = mkPrep "înapoia" Ge ; - between_Prep = mkPrep "între" Ac True ; - both7and_DConj = {s1,s2 = "ºi" ; n = Pl} ; + before_Prep = mkPrep "înaintea" Ge ; + behind_Prep = mkPrep "înapoia" Ge ; + between_Prep = mkPrep "între" Ac True ; + both7and_DConj = {s1,s2 = "ÅŸi" ; n = Pl} ; but_PConj = ss "dar" ; - by8agent_Prep = mkPrep "de cãtre" Ac True; + by8agent_Prep = mkPrep "de către" Ac True; by8means_Prep = mkPrep "de" Ac True; can8know_VV = mkVV (v_besch68 "putea") ; can_VV = mkVV (v_besch68 "putea") ; - during_Prep = mkPrep "în timpul" Ge ; + during_Prep = mkPrep "în timpul" Ge ; either7or_DConj = {s1,s2 = "sau" ; n = Pl} ; - everybody_NP = mkNP "toþi" "tuturor" Pl Masc True; -- form for Fem needed also ! - every_Det = mkDet "orice" "orice" "oricãrui" "oricãrei" "orice" "orice" "oricãruia" "oricãreia" Sg ; + everybody_NP = mkNP "toÅ£i" "tuturor" Pl Masc True; -- form for Fem needed also ! + every_Det = mkDet "orice" "orice" "oricărui" "oricărei" "orice" "orice" "oricăruia" "oricăreia" Sg ; everything_NP = mkNP "totul" nonExist Sg Masc False; everywhere_Adv = ss "pretutindeni" ; - few_Det = mkDet "câþiva" "câteva" "câtorva" "câtorva" Pl ; + few_Det = mkDet "câţiva" "câteva" "câtorva" "câtorva" Pl ; for_Prep = mkPrep "pentru" Ac True; from_Prep = mkPrep "de la" Ac True; he_Pron = mkPronoun - "el" "el" "lui" "lui" [] "sãu" "sa" "sãi" "sale" Masc Sg P3 ; + "el" "el" "lui" "lui" [] "său" "sa" "săi" "sale" Masc Sg P3 ; here7from_Adv = ss "de aici" ; - here7to_Adv = ss "pânã aici" ; + here7to_Adv = ss "până aici" ; here_Adv = ss "aici" ; how_IAdv = ss "cum" ; how8many_IDet = {s = \\g,c => case of - { => "câtor"; => "câte" ; - => "câtor" ; _ => "câþi" + { => "câtor"; => "câte" ; + => "câtor" ; _ => "câţi" }; n = Pl } ; - if_Subj = ss "dacã" ; - in8front_Prep = mkPrep "în faþa" Ge ; + if_Subj = ss "dacă" ; + in8front_Prep = mkPrep "în faÅ£a" Ge ; i_Pron = mkPronoun "eu" "mine" "mie" [] [] "meu" "mea" "mei" "mele" Masc Sg P1 ; - in_Prep = mkPrep "în" Ac True; + in_Prep = mkPrep "în" Ac True; it_Pron = mkPronoun - "" "el" "lui" "lui" [] "sãu" "sa" "sãi" "sale" Masc Sg P3 ; + "" "el" "lui" "lui" [] "său" "sa" "săi" "sale" Masc Sg P3 ; have_V2 = dirV2 (v_have) ; - less_CAdv = {s = "mai puþin" ; sNum = ""; p = conjThan ; lock_CAdv = <> } ; - many_Det = mkDet "mulþi" "multe" "multor" "multor" "mulþi" "multe" "multora" "multora" Pl; + less_CAdv = {s = "mai puÅ£in" ; sNum = ""; p = conjThan ; lock_CAdv = <> } ; + many_Det = mkDet "mulÅ£i" "multe" "multor" "multor" "mulÅ£i" "multe" "multora" "multora" Pl; more_CAdv = {s = "mai" ; sNum = "mult" ; p =conjThan ; lock_CAdv = <>}; most_Predet = { - s = \\a => table { AGenDat => "marii parþi a" ; + s = \\a => table { AGenDat => "marii parÅ£i a" ; ANomAcc => "marea parte a"; AVoc => "mare parte a" }; c = Ge }; - much_Det = mkDet "mult" "multã" nonExist nonExist Sg ; + much_Det = mkDet "mult" "multă" nonExist nonExist Sg ; must_VV = mkVV (v_besch140 "trebui") ; no_Utt = ss "nu" ; on_Prep = mkPrep "pe" Ac True; @@ -81,18 +81,18 @@ lin or_Conj = {s1 = [] ; s2 = "sau" ; n = Sg} ; otherwise_PConj = ss "altfel" ; part_Prep = mkPrep "din" Ac True; - please_Voc = ss ["vã rog"] ; + please_Voc = ss ["vă rog"] ; possess_Prep = mkPrep "" Ge ; -- required forms for Fem Sg, Masc Pl and Fem Pl - maybe variants quite_Adv = ss "chiar" ; she_Pron = mkPronoun - "ea" "ea" "ei" "ei" [] "sãu" "sa" "sãi" "sale" + "ea" "ea" "ei" "ei" [] "său" "sa" "săi" "sale" Fem Sg P3 ; - so_AdA = ss "aºa" ; + so_AdA = ss "aÅŸa" ; somebody_NP = mkNP "cineva" "cuiva" Sg Masc True; somePl_Det = mkDet "unii" "unele" "unor" "unor" "unii" "unele" "unora" "unora" Pl ; -someSg_Det = mkDet "niºte" "niºte" "la niºte" "la niºte" Sg ; +someSg_Det = mkDet "niÅŸte" "niÅŸte" "la niÅŸte" "la niÅŸte" Sg ; something_NP = mkNP "ceva" "a ceva" Sg Masc False; somewhere_Adv = ss ["undeva"] ; --- ne - pas @@ -133,10 +133,10 @@ that_Quant = { }; there7from_Adv = ss ["de acolo"] ; - there7to_Adv = ss "pânã acolo" ; + there7to_Adv = ss "până acolo" ; there_Adv = ss "acolo" ; therefore_PConj = ss "astfel" ; - --these_NP = mkNP "aceºtia" "acestora" Masc Pl True; --form for Fem needed also ! + --these_NP = mkNP "aceÅŸtia" "acestora" Masc Pl True; --form for Fem needed also ! they_Pron = mkPronoun "ei" "ei" "lor" "lor" [] "lor" "lor" "lor" "lor" Masc Pl P3 ; @@ -146,11 +146,11 @@ that_Quant = { _ => "acest" }; Fem => table {AGenDat => "acestei"; - _ => "aceastã" + _ => "această" } }; Pl => table { Masc => table {AGenDat => "acestor"; - _ => "aceºti" + _ => "aceÅŸti" }; Fem => table {AGenDat => "acestor"; _ => "aceste" @@ -166,7 +166,7 @@ that_Quant = { } }; Pl => table {Masc => table {AGenDat => "acestora"; - _ => "aceºtia" + _ => "aceÅŸtia" }; Fem => table {AGenDat => "acestora"; _ => "acestea" @@ -182,12 +182,12 @@ that_Quant = { very_AdA = ss "foarte" ; want_VV = mkVV (v_besch74 "vrea") ; we_Pron = mkPronoun - "noi" "noi" "nouã" [] [] "nostru" "noastrã" "noºtri" "noastre" + "noi" "noi" "nouă" [] [] "nostru" "noastră" "noÅŸtri" "noastre" Masc Pl P1 ; whatSg_IP = {s = \\c => case c of - { Da => "cãruia" ; - Ge => "a cãruia" ; + { Da => "căruia" ; + Ge => "a căruia" ; _ => "ce" }; a = aagr Masc Sg; hasRef = False @@ -195,24 +195,24 @@ whatSg_IP = whatPl_IP = {s = \\c => case c of - { Da => "cãrora" ; - Ge => "a cãrora" ; + { Da => "cărora" ; + Ge => "a cărora" ; _ => "ce" }; a = aagr Masc Pl; hasRef = False }; - when_IAdv = ss "când" ; - when_Subj = ss "când" ; + when_IAdv = ss "când" ; + when_Subj = ss "când" ; where_IAdv = ss "unde" ; which_IQuant = {s = table { - Sg => table {Masc => table { AGenDat => "cãrui"; + Sg => table {Masc => table { AGenDat => "cărui"; _ => "care" }; - Fem => table {AGenDat => "cãrei"; + Fem => table {AGenDat => "cărei"; _ => "care" } }; - Pl => \\g => table {AGenDat => "cãror"; + Pl => \\g => table {AGenDat => "căror"; _ => "care" } @@ -236,16 +236,16 @@ whatPl_IP = hasRef = True }; why_IAdv = ss "de ce" ; - without_Prep = mkPrep "fãrã" Ac True; + without_Prep = mkPrep "fără" Ac True; with_Prep = mkPrep "cu" Ac ; yes_Utt = ss "da" ; youSg_Pron = mkPronoun - "tu" "tine" "þie" [] "tu" "tãu" "ta" "tãi" "tale" + "tu" "tine" "Å£ie" [] "tu" "tău" "ta" "tăi" "tale" Masc Sg P2 ; youPl_Pron, youPol_Pron = mkPronoun - "voi" "voi" "vouã" [] "voi" "vostru" "voastrã" "voºtri" "voastre" + "voi" "voi" "vouă" [] "voi" "vostru" "voastră" "voÅŸtri" "voastre" Masc Pl P2 ; not_Predet = {s = \\a,c => "nu" ; c = No} ; @@ -269,10 +269,10 @@ whatPl_IP = } } ; sp = table { - Sg => table {Masc => table { AGenDat => "nimãnui"; + Sg => table {Masc => table { AGenDat => "nimănui"; _ => "nimeni" }; - Fem => table {AGenDat => "nimãnui"; + Fem => table {AGenDat => "nimănui"; _ => "nimeni" } }; @@ -286,14 +286,14 @@ whatPl_IP = } ; isDef = False ; isPost = False ; hasRef = False }; - if_then_Conj = {s1 = "dacã" ; s2 = "atunci" ; n = Sg ; lock_Conj = <>} ; - nobody_NP = mkNP "nimeni" "nimãnui" Sg Masc True; + if_then_Conj = {s1 = "dacă" ; s2 = "atunci" ; n = Sg ; lock_Conj = <>} ; + nobody_NP = mkNP "nimeni" "nimănui" Sg Masc True; nothing_NP = mkNP "nimic" "nimicului" Sg Masc False; - at_least_AdN = ss "cel puþin" ; + at_least_AdN = ss "cel puÅ£in" ; at_most_AdN = ss "cel mult" ; - except_Prep = mkPrep "cu excepþia" Ge ; + except_Prep = mkPrep "cu excepÅ£ia" Ge ; as_CAdv = { s = "la fel de"; sNum = "mult"; p = "ca" ; lock_CAdv = <> };