catalan adjectives in lexicon

lib/resource-1.0/catalan/LexiconCat.gf

@@ -19,17 +19,17 @@ lin
    art_N = regMN "art" ;    
 --   ask_V2Q = mkV2Q (regV "preguntar") dative ;
    baby_N = regMN "nadó" ;
---   bad_A = prefA (mkADeg (regA "malo") (regA "peor")) ;
+   bad_A = mkADeg (regA "dolent") (regA "pitjor") ;
    bank_N = regMN "banc" ;
---   beautiful_A = prefA (regADeg "bello") ;    -- bella
+	beautiful_A = prefA (regADeg "bell") ;
 --   become_VA = reflV (regV "convertir") ;  --- convertirse en, volverse, ponerse
    beer_N = regFN "cervesa" ;
 --   beg_V2V = mkV2V (regV "rogar") accusative dative ;   -- pedir
---   big_A = prefA (regADeg "grande") ;
+   big_A = regADeg "gros" ;
    bike_N = regFN "bicicleta" ;
    bird_N = regMN "ocell" ;
---   black_A = regADeg "negro" ;    -- negra
---   blue_A = regADeg "azul" ;
+	black_A = regADeg "negre" ; 
+	blue_A = regADeg "blau" ;
    boat_N = regFN "barca" ;
    book_N = regMN "llibre" ;
    boot_N = regFN "bota" ;
@@ -37,9 +37,9 @@ lin
    boy_N = regMN "noi" ;
    bread_N = regMN "pa" ;
    break_V2 = dirV2 (regV "trencar") ;
---   broad_A = regADeg "ancho" ;
+	broad_A = regADeg "ample" ;
    brother_N2 = deN2 (regMN "germà") ;
---   brown_A = regADeg "marrón" ; --- *
+	brown_A = compADeg (mkA "marró" "marrona" "marrons" "marrones" "marronament") ; --- *
    butter_N = regFN "mantega" ;
    buy_V2 = dirV2 (regV "comprar") ;
    camera_N = regFN "càmara" ; -- ["máquina fotográfica"]
@@ -53,18 +53,18 @@ lin
    child_N = regMN "nen" ;      -- nena
    church_N = regFN "església" ;
    city_N =  regFN "ciutat" ;   
---   clean_A = regADeg "limpio" ;
---   clever_A = regADeg "inteligente" ;
-    close_V2 = dirV2 (regV "tancar") ;
-    coat_N = regMN "abric" ;
---   cold_A = regADeg "frío" ;      -- fría
+   clean_A = regADeg "net" ;
+   clever_A = regADeg "inteligent" ;
+   close_V2 = dirV2 (regV "tancar") ;
+   coat_N = regMN "abric" ;
+   cold_A = regADeg "fred" ;
 --   come_V = verbV (venir_117 "venir") ;
     computer_N = regMN "ordinador" ;    
    country_N = regMN "país" ;       -- masc
    cousin_N = regMN "cosí" ;
    cow_N = regFN "vaca" ;
 --   die_V = verbV (morir_71 "morir") ;
---   dirty_A = regADeg "sucio" ;
+	dirty_A = regADeg "brut" ;
    distance_N3 = mkN3 (regFN "distància") genitive dative ;
    doctor_N = regMN "metge" ;       -- médica
    dog_N = regMN "gos" ;        -- perra
@@ -72,7 +72,7 @@ lin
 --   drink_V2 = dirV2 (regV "tomar") ;     -- beber
 --   easy_A2V = mkA2V (regA "fácil") dative genitive ;
    eat_V2 = dirV2 (regV "menjar") ;
---   empty_A = regADeg "vacío" ;
+   empty_A = compADeg (mkA "buit" "buida" "buits" "buides" "buidament") ;
    enemy_N = regMN "enemic" ;       -- enemiga
    factory_N = regFN "fàbrica" ;    
    father_N2 = deN2 (regMN "pare") ;
@@ -89,9 +89,9 @@ lin
    girl_N = regFN "noia" ;
    glove_N = regMN "guant" ;
    gold_N = regMN "or" ;
---   good_A = prefA (mkADeg (regA "bueno") (regA "mejor")) ; ---- adv?
+   good_A = mkADeg (mkA "bó" "bona" "bons" "bones" "bonament") (regA "millor") ; ---- adv?
 --   go_V = (verbV (anar_4 "anar")) ;
---   green_A = regADeg "verde" ;
+	green_A = regADeg "verd" ;
    harbour_N = regMN "port" ;
    hate_V2 = dirV2 (regV "odiar") ;
    hat_N = regMN "barret" ;
@@ -100,9 +100,9 @@ lin
    hill_N = regMN "turó" ;
    hope_VS = mkVS (regV "esperar") ;
    horse_N = regMN "cavall" ;
---   hot_A = regADeg "caliente" ;
+	hot_A = regADeg "calent" ;
    house_N = regFN "casa" ;
---   important_A = regADeg "importante" ;
+	important_A = regADeg "important" ;
    industry_N = regFN "indústria" ;
    iron_N = regMN "ferro" ;
    king_N = regMN "rei" ;
@@ -115,7 +115,7 @@ lin
 --   like_V2 = dirV2 (regV "agradar") ;
    listen_V2 = dirV2 (regV "escoltar") ;
    live_V = verbV (viure_119 "viure") ;
---   long_A = regADeg "largo" ;
+	long_A = regADeg "llarg" ;
 --   lose_V2 = dirV2 (verbV "perdre") ;
    love_N = regMN "amor" ;
    love_V2 = dirV2 (regV "estimar") ;
@@ -127,11 +127,11 @@ lin
    mother_N2 = deN2 (regFN "mare") ;    -- fem
    mountain_N = regFN "muntanya" ;
    music_N = regFN "música" ;
---   narrow_A = regADeg "estrecho" ;
---   new_A = prefA (regADeg "nuevo") ;
+   narrow_A = regADeg "estret" ;
+   new_A = compADeg (mkA "nou" "nova" "nous" "noves" "novament") ;
    newspaper_N = regMN "diari" ;        -- periòdic  
    oil_N = regMN "oli" ;
---   old_A =  prefA (regADeg "viejo") ;
+   old_A =  regADeg "vell" ;
 -- open_V2 = dirV2 (special_ppV (regV "abrir") "abierto") ;
 --   paint_V2A = mkV2A (regV "pintar") accusative (mkPreposition "en") ;
    paper_N = regMN "paper" ;
@@ -148,7 +148,7 @@ lin
    radio_N = regFN "ràdio" ;
 --   rain_V0 = mkV0 (verbV (moure_72 "ploure")) ;
 --   read_V2 = dirV2 (verbV (servir_101 "llegir")) ;
---   red_A = regADeg "rojo" ;
+   red_A = regADeg "vermell" ;
    religion_N = mkN "religió" "religions" feminine ;
    restaurant_N = regMN "restaurant" ;      
    river_N = regMN "riu" ;
@@ -169,11 +169,11 @@ lin
    shirt_N = regFN "camisa" ;
    shoe_N = regFN "sabata" ;
    shop_N = regFN "botiga" ;
---   short_A = regADeg "corto" ; --- breu
+	short_A = regADeg "curt" ; --- breu
    silver_N = regFN "plata" ;
    sister_N = regFN "germana" ;
 --   sleep_V = verbV (dormir_44 "dormir") ;
---   small_A = prefA (regADeg "pequeño") ;
+	small_A = prefA (regADeg "petit") ;
    snake_N = regFN "serp" ;     -- fem
    sock_N = regMN "mitjó" ;
 --   speak_V2 = dirV2 (regV "parlar") ;
@@ -182,7 +182,7 @@ lin
    stone_N = regFN "pedra" ;
    stove_N = regMN "forn" ; 
    student_N = regN "estudiant" ;   -- used both for fem & masc
---   stupid_A = regADeg "estúpido" ;
+   stupid_A = regADeg "estúpid" ;
    sun_N = regMN "sol" ;    
 --   switch8off_V2 = dirV2 (regV (pregar_86 "apagar")) ;
 --   switch8on_V2 = dirV2 (regV (atendre_8 "encendre")) ;
@@ -191,23 +191,23 @@ lin
    teacher_N = regMN "mestre" ;     -- mestra
 --   teach_V2 = dirV2 (regV "ensenyar") ;
    television_N = mkN "televisió" "televisions" feminine ;  -- televisor masc
---   thick_A = regADeg "grueso" ;
---   thin_A = regADeg "fino" ;          -- delgado
+   thick_A = compADeg (mkA "gruixut" "gruixuda" "gruixuts" "gruixudes" "gruixudament") ;
+   thin_A = compADeg (mkA "fi" "fina" "fins" "fines" "finament") ;
    train_N = regMN "tren" ;
 --   travel_V = regV (envejar_48 "viajar") ;
    tree_N = regMN "arbre" ;
   --- trousers_N = regN "pantalón" ;    -- masc
---   ugly_A = regADeg "feo" ;
+   ugly_A = compADeg (mkA "lleig" "lletja" "lletjos" "lletges" "lletjament") ;
 --   understand_V2 = dirV2 (regV (atendre_8 "entendre")) ;
    university_N = regFN "universitat" ;
    village_N = regMN "poble" ;
 --   wait_V2 = mkV2 (regV "esperar") dative ;
 --   walk_V = regV "caminar" ;
---   warm_A = regADeg "tibio" ;
+   warm_A = regADeg "tebi" ;
    war_N = regFN "guerra" ;
    watch_V2 = dirV2 (regV "mirar") ;
    water_N = regFN "aigua" ;
---   white_A = compADeg (regA "blanco") ;
+   white_A = compADeg (mkA "blanc" "blanca" "blancs" "blanques" "blancament") ;
    window_N = regFN "finestra" ;
    wine_N = regMN "vi" ;
 --   win_V2 = dirV2 (regV "guanyar") ;
@@ -215,8 +215,8 @@ lin
 --   wonder_VQ = mkVQ (reflV (regV "preguntar")) ;
    wood_N = regFN "fusta" ;
 --   write_V2 = dirV2 (special_ppV (regV (escriure_50 "escriure")) "escrito") ;
---   yellow_A = regADeg "amarillo" ;
---   young_A = prefA (regADeg "joven") ;
+	yellow_A = compADeg (mkA "groc" "groga" "grocs" "grogues" "grogament") ;
+	young_A = compADeg (mkA "jove" "jove" "joves" "joves" "jovement") ;
 --
 --   do_V2 =  dirV2 (verbV (fer_56 "fer")) ;
    now_Adv = mkAdv "ara" ;
@@ -231,19 +231,19 @@ lin
 --  left_Ord = mkOrd (regA "izquierda") ;
 --  right_Ord = mkOrd (regA "derecha") ;
 --  far_Adv = mkAdv "lejos" ; ----?
---   correct_A = regA "correcto" ;
---   dry_A = regA "seco" ;
---   dull_A = regA "desafilado" ;
---   full_A = regA "lleno" ;
---   heavy_A = regA "pesado" ;
---   near_A = regA "cerca" ;
---   rotten_A = regA "podrido" ;
---   round_A = regA "redondo" ;
---   sharp_A = regA "filoso" ; -- afilado, puntiagudo
---   smooth_A = regA "liso" ;     -- suave
---   straight_A = regA "directo" ;
---   wet_A = regA "mojado" ;
---   wide_A = regA "ancho" ;      -- extenso
+    correct_A = regA "correcte" ;
+   	dry_A = regA "sec" ;
+   	dull_A = regA "balb" ;
+  	full_A = regA "ple" ;
+   	heavy_A = regA "pesat" ;
+	near_A = regA "proper" ;
+ 	rotten_A = regA "podrit" ;
+ 	round_A = regA "rodó" ;
+	sharp_A = regA "esmolat" ; -- punxegut
+	smooth_A = regA "llis" ;
+	straight_A = regA "directe" ;
+   	wet_A = regA "moll" ;
+	wide_A = regA "extens" ;
    animal_N = regMN "animal" ;           -- masc (sometimes fem when adj)
    ashes_N = regMN "cendra" ;
    back_N = regFN "esquena" ;

lib/resource-1.0/catalan/ParadigmsCat.gf

@@ -307,7 +307,7 @@ oper
   mkA a b c d e = 
     compADeg {s = \\_ => (mkAdj a b c d e).s ; isPre = False ; lock_A = <>} ;
   regA a = compADeg {s = \\_ => (mkAdjReg a).s ; isPre = False ; lock_A = <>} ;
---  prefA a = {s = a.s ; isPre = True ; lock_A = <>} ;
+  prefA a = {s = a.s ; isPre = True ; lock_A = <>} ;
 --
    mkA2 a p = a ** {c2 = p ; lock_A2 = <>} ;
 --