updated next-resource/src/catalan/Lexicon and Paradigms to Jordi's patches in 1.4

next-lib/src/catalan/LexiconCat.gf

@@ -14,7 +14,7 @@ oper
 lin
    airplane_N = regMN "avió" ;  
 
-   answer_V2S = mkV2S (regV "respondre") dative ;
+   answer_V2S = mkV2S (verbV (compondre_26 "respondre")) dative ;
    apartment_N = regMN "pis" ;
    apple_N = regFN "poma" ;
    art_N = regMN "art" ;    
@@ -37,7 +37,7 @@ lin
    boss_N = regMN "cap" ;
    boy_N = regMN "noi" ;
    bread_N = irregMN "pa" "pans" ;
-   break_V2 = dirV2 (regV "trencar") ;
+   break_V2 = dirV2 (verbV (trencar_112 "trencar")) ;
    broad_A = regADeg "ample" ; -- put it in MorphoCat?: like  black_A
    brother_N2 = deN2 (regMN "germà") ;
    brown_A = compADeg (mkA "marró" "marrona" "marrons" "marrones" "marronament") ;
@@ -56,28 +56,28 @@ lin
    city_N =  regFN "ciutat" ;   
    clean_A = regADeg "net" ;
    clever_A = regADeg "inteligent" ;
-   close_V2 = dirV2 (regV "tancar") ;
+   close_V2 = dirV2 (verbV (trencar_112 "tancar")) ;
    coat_N = regMN "abric" ;
    cold_A = regADeg "fred" ;
-	come_V = verbV (venir_117 "venir") ;
+   come_V = verbV (venir_117 "venir") ;
-    computer_N = regMN "ordinador" ;    
+   computer_N = regMN "ordinador" ;    
    country_N = regMN "país" ;       -- masc
    cousin_N = regMN "cosí" ;
    cow_N = regFN "vaca" ;
-  	die_V = verbV (morir_71 "morir") ;
+   die_V = verbV (morir_71 "morir") ;
-	dirty_A = regADeg "brut" ;
+   dirty_A = regADeg "brut" ;
    distance_N3 = mkN3 (regFN "distància") genitive dative ;
    doctor_N = regMN "metge" ;   -- metgessa
    dog_N = regMN "gos" ;        -- gossa
    door_N = regFN "porta" ;
-   drink_V2 = dirV2 (regV "beure") ;
+   drink_V2 = dirV2 (verbV (beure_11 "beure")) ;
    easy_A2V = mkA2V (regA "fácil") dative genitive ;
-   eat_V2 = dirV2 (regV "menjar") ;
+   eat_V2 = dirV2 (verbV (envejar_48 "menjar")) ;
    empty_A = compADeg (mkA "buit" "buida" "buits" "buides" "buidament") ;
    enemy_N = regMN "enemic" ;       -- enemiga
    factory_N = regFN "fàbrica" ;
    father_N2 = deN2 (regMN "pare") ;
-   fear_VS = mkVS (regV "tèmer") ;
+   fear_VS = mkVS (verbV (témer_107 "témer")) ;
    find_V2 = dirV2 (regV "trobar") ;
    fish_N = regMN "peix" ;
    floor_N = regMN "terra" ;        -- sòl
@@ -92,12 +92,12 @@ lin
    gold_N = regMN "or" ;
    good_A = mkADeg (mkA "bó" "bona" "bons" "bones" "bonament") (regA "millor") ; ---- adv?
    go_V = (verbV (anar_4 "anar")) ;
-	green_A = regADeg "verd" ;
+   green_A = regADeg "verd" ;
    harbour_N = regMN "port" ;
-   hate_V2 = dirV2 (regV "odiar") ;
+   hate_V2 = dirV2 (verbV (canviar_16 "odiar")) ;
    hat_N = regMN "barret" ;
    have_V2 = dirV2 (verbV (tenir_108 "tenir")) ;
-   hear_V2 = mkV2 (regV "escoltar") dative ; 
+   hear_V2 = mkV2 (regV "escoltar") dative ; -- Must be "oir". Add it to Besch
    hill_N = regMN "turó" ;
    hope_VS = mkVS (regV "esperar") ;
    horse_N = regMN "cavall" ;
@@ -107,17 +107,17 @@ lin
    industry_N = regFN "indústria" ;
    iron_N = regMN "ferro" ;
    king_N = regMN "rei" ;
-   know_V2 = dirV2 (regV "saber") ;
+   know_V2 = dirV2 (verbV (saber_99 "saber")) ;
    lake_N = regMN "llac" ;
    lamp_N = regFN "làmpada" ;
-   learn_V2 = dirV2 (regV "aprendre") ;
+   learn_V2 = dirV2 (verbV (aprendre_6 "aprendre")) ;
    leather_N = regMN "cuiro" ;
    leave_V2 = dirV2 (regV "partir") ;
-   like_V2 = dirV2 (regV "agradar") ;
+   like_V2 = dirV2 (verbV (canviar_16 "apreciar")) ;
    listen_V2 = dirV2 (regV "escoltar") ;
    live_V = verbV (viure_119 "viure") ;
    long_A = regADeg "llarg" ;
-   lose_V2 = dirV2 (regV "perdre") ;
+   lose_V2 = dirV2 (verbV (perdre_83 "perdre")) ;
    love_N = regMN "amor" ;
    love_V2 = dirV2 (regV "estimar") ;
    man_N = regMN "home" ;       -- masc
@@ -133,7 +133,7 @@ lin
    newspaper_N = regMN "diari" ;        -- periòdic  
    oil_N = regMN "oli" ;
    old_A =  regADeg "vell" ;
-   open_V2 = dirV2 (regV "obrir") ;
+   open_V2 = dirV2 (verbV (obrir_77 "obrir")) ;
    paint_V2A = mkV2A (regV "pintar") accusative (mkPrep "en") ;
    paper_N = regMN "paper" ;
    paris_PN = mkPN "Paris" masculine ;
@@ -141,7 +141,7 @@ lin
    pen_N = regMN "llapis" ;
    planet_N = regMN "planeta" ;
    plastic_N = regMN "plàstic" ;
-   play_V2 = dirV2 (regV "jugar") ;
+   play_V2 = dirV2 (verbV (pregar_86 "jugar")) ;
    policeman_N = regMN "policia" ;  -- fem refers to the institution
    priest_N = regMN "capellà" ;     -- masc
    probable_AS = mkAS (regA "probable") ; 
@@ -164,7 +164,7 @@ lin
    seek_V2 = dirV2 (verbV (trencar_112 "buscar")) ;
    see_V2 = dirV2 (verbV (veure_118 "veure")) ;
    sell_V3 = dirV3 (verbV (vendre_116 "vendre")) dative ;
-   send_V3 = dirV3 (regV "enviar") dative ;
+   send_V3 = dirV3 (verbV (canviar_16 "enviar")) dative ;
    sheep_N = regFN "ovella" ;   -- xai
    ship_N = regMN "vaixell" ;
    shirt_N = regFN "camisa" ;
@@ -222,7 +222,7 @@ lin
    now_Adv = mkAdv "ara" ;
    already_Adv = mkAdv "ja" ;
    song_N = mkN "cançó" "cançons" feminine ;
-   add_V3 = dirV3 (regV "sumar") dative ;
+   add_V3 = dirV3 (regV "afegir") dative ; -- also: (regV "sumar")
    number_N = regMN "número" ;
    put_V2 = dirV2 (regV "posar") ;
    stop_V = regV "aturar" ; 
@@ -306,7 +306,7 @@ lin
    wing_N = regFN "ala" ;
    worm_N = regMN "cuc" ;             
    year_N = regMN "any" ;
-   bite_V2 = dirV2 (regV "mossegar") ;
+   bite_V2 = dirV2 (verbV (pregar_86 "mossegar")) ;
    blow_V = regV "bufar" ;
    burn_V = regV "cremar" ;
    count_V2 = dirV2 (regV "comptar") ;
@@ -316,28 +316,28 @@ lin
    fear_V2 = dirV2 (verbV (témer_107 "témer")) ;
    fight_V2 = dirV2 (regV "lluitar") ;
    float_V = regV "surar" ;
-   flow_V = regV "circular" ;
+   flow_V = verbV (reduir_94 "fluir") ; -- also: regV "circular"
    fly_V = regV "volar" ;
    freeze_V = regV "congelar" ;
    give_V3 = dirdirV3 (verbV (donar_43 "donar")) ;
-   hit_V2 = dirV2 (regV "picar") ;
+   hit_V2 = dirV2 (verbV (trencar_112 "picar")) ;
    hold_V2 = dirV2 (verbV (obtenir_78 "sostenir")) ;
-   hunt_V2 = dirV2 (regV "caçar") ;
+   hunt_V2 = dirV2 (verbV (començar_22 "caçar")) ;
    kill_V2 = dirV2 (regV "matar") ;
    laugh_V = verbV (riure_96 "riure") ; 
-   lie_V = reflV (regV "jeure") ;
+   lie_V = reflV (verbV (jeure_62 "jeure")) ;
    play_V = verbV (pregar_86 "jugar") ;
    pull_V2 = dirV2 (regV "tibar") ;
    push_V2 = dirV2 (verbV (atènyer_59 "empènyer")) ;
    rub_V2 = dirV2 (verbV (pregar_86 "refregar")) ;
    scratch_V2 = dirV2 (regV "gratar") ;
-   sew_V = regV "cosir" ;
+   sew_V = verbV (cosir_31 "cosir") ;
    sing_V = regV "cantar" ;
-   sit_V = reflV (regV "seure") ;
+   sit_V = reflV (verbV (seure_102 "seure")) ;
-   smell_V = verbV (cantar_15 "ensumar") ;
+   smell_V = regV "ensumar" ;
    spit_V = verbV (escopir_49 "escopir") ;
    split_V2 = dirV2 (regV "separar") ; -- dividir,) ;
-   squeeze_V2 = dirV2 (regV "exprèmer") ;
+   squeeze_V2 = dirV2 (verbV (servir_101 "exprimir")) ;
    stab_V2 = dirV2 (regV "apunyalar") ;
    stand_V = verbV (estar_54 "estar") ; ---- "estar dret"
    suck_V2 = dirV2 (regV "xuclar") ;
@@ -346,8 +346,8 @@ lin
    think_V = regV "pensar" ;
    throw_V2 = dirV2 (verbV (començar_22 "llençar")) ;
    tie_V2 = dirV2 (verbV (pregar_86 "lligar")) ;
-   turn_V = verbV (pregar_86 "doblegar") ;
+   turn_V = regV "girar" ;
-   vomit_V = verbV (envejar_48 "vomitar") ;
+   vomit_V = regV "vomitar" ;
    wash_V2 = dirV2 (regV "rentar") ;
    wipe_V2 = dirV2 (verbV (pregar_86 "eixugar")) ;
    breathe_V = regV "respirar" ;