Adjective Smart Paradigm

3 files changed, 45 insertions, 46 deletions

diff --git a/next-lib/src/romanian/CatRon.gf b/next-lib/src/romanian/CatRon.gf
index f3e756e64..a43aa5d3b 100644
--- a/next-lib/src/romanian/CatRon.gf
+++ b/next-lib/src/romanian/CatRon.gf
@@ -22,7 +22,7 @@ concrete CatRon of Cat =
     AP = {s : AForm => Str ; isPre : Bool} ; 

 

 -- Noun

-

+ lincat 

     CN      = {s : Number => Str ; g : Gender} ;

  --   Pron    = Pronoun ;

  --   NP      = NounPhrase ;

diff --git a/next-lib/src/romanian/LexiconRon.gf b/next-lib/src/romanian/LexiconRon.gf
index 5ee0b1847..1fe317afe 100644
--- a/next-lib/src/romanian/LexiconRon.gf
+++ b/next-lib/src/romanian/LexiconRon.gf
@@ -14,17 +14,17 @@ lin
  art_N = mkN "artă" ;

  ask_V2Q = mkV2Q (v_besch29 "întreba") (noPrep Ac) ; 

  baby_N = mkAnim (mkN "bebeluș" masculine) ;

- bad_A =  mk4A "rău" "rea" "răi" "rele" ;

+ 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 = regA "mare" ;

+ big_A = mkA "mare" ;

  bike_N = mkN "bicicletă" ;

  bird_N = mkN "pasăre" "păsări" ;

  black_A = mkRMut "negru" ;

- blue_A = regA "albastru" ;

+ blue_A = mkA "albastru" ;

  boat_N = mkN "vapor" neuter ;

  book_N = mkN "carte" "cărți" ;

  boot_N = mkN "cizmă" ;

@@ -32,7 +32,7 @@ lin
  boy_N = mkAnim (mkN "băiat" "băieți") ;

  bread_N = mkN "pâine";

  break_V2 = dirV2 (v_besch97 "sparge") ;

- broad_A = regA "larg" ;

+ broad_A = mkA "larg" ;

  brother_N2 = mkN2 (mkAnim(mkN "frate" masculine)) (noPrep Ge) ;

  brown_A = invarA "maro" ;

  butter_N = mkNR "unt";

@@ -48,18 +48,18 @@ lin
  child_N = mkAnim (mkN "copil" "copii" ) ;

  church_N = mkN "biserică"  ;

  city_N = mkN "oraș" ;

- clean_A = regA "curat" ;

- clever_A = regA "deștept" ; 

+ clean_A = mkA "curat" ;

+ clever_A = mkRMut "deștept" ; 

  close_V2 = dirV2 (mkV "închide") ;

  coat_N = mkN "haină" ;

- cold_A = regA "rece" ;

+ 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"  ;

  die_V = v_besch129 "muri" ;

- dirty_A = regA "murdar" ;

+ dirty_A = mkA "murdar" ;

  distance_N3 = mkN3 (mkN "distanță") (mkPrep "de la" Ac) (mkPrep "la" Ac) ;

  doctor_N = mkAnim (mkN "doctor") ;

  dog_N = mkN "câine" masculine ;

@@ -80,14 +80,14 @@ lin
  fridge_N = mkN "frigider" ;

  friend_N = mkAnim (mkN "prieten") ;

  fruit_N = mkN "fruct"  ;

- fun_AV = mkAV (regA "distractiv") (noPrep Ac) ;

+ 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" ;

  gold_N = mkNR "aur" ;

-good_A = mk5A "bun" "bună" "buni" "bune" "bine" ;

+good_A = mkA "bun" "bună" "buni" "bune" "bine" ;

 go_V = v_besch90 "merge" ;

-green_A = regA "verde" ;

+green_A = mkA "verde" ;

 harbour_N = mkNR "port" ;

 hate_V2 = dirV2 (mkV "urî") ;

 hat_N = mkN "pălărie" ;

@@ -96,9 +96,9 @@ hear_V2 = dirV2 (v_besch127 "auzi") ;
 hill_N = mkNR "deal" ;

 hope_VS = mkVS (v_besch17 "spera") ;

 horse_N = mkN "cal" "cai" ;

-hot_A = regA "cald" ;

+hot_A = mkA "cald" ;

 house_N = mkN "casă" ;

-important_A = regA "important" ;

+important_A = mkA "important" ;

 industry_N = mkN "industrie" ;

 iron_N = mkN "fier" masculine ;

 king_N = mkAnim (mkN "rege" masculine) ;

@@ -112,23 +112,23 @@ 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" ;

-long_A = regA "lung" ;

+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 (regA "căsătorit") (mkPrep "cu" Ac) ;

+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) ;

 mountain_N = mkN "munte" masculine ;

 music_N = mkN "muzică" ;

-narrow_A = regA "îngust" ;

-new_A = mk4A "nou" "nouă" "noi" "noi" ;

+narrow_A = mkA "îngust" ;

+new_A = mkA "nou" "nouă" "noi" "noi" ;

 newspaper_N = mkN "ziar" ;

 oil_N = mkNR "ulei" ;

-old_A = regA "vechi" ; 

+old_A = mkA "vechi" "veche" "vechi" "vechi" ; 

 open_V2 = dirV2 (mkV "deshide") ;

 paint_V2A = mkV2A (mkV "picta") (noPrep Ac) (mkPrep "cu" Ac) ; 

 paper_N = mkN "hârtie" ;

@@ -140,12 +140,12 @@ plastic_N = mkN "plastic" ;
 play_V2 = dirV2 (v_besch48 "juca") ;

 policeman_N = mkAnim (mkN "polițist" masculine) ;

 priest_N = mkAnim (mkN "preot" masculine) ;

-probable_AS = mkAS (regA "probabil") ;

+probable_AS = mkAS (mkA "probabil") ;

 queen_N = mkAnim (mkN "regină" "regine") ;

 radio_N = mkNR "radio";

 --rain_V0 = mkV0 (v_besch54 "ploua") ;

 read_V2 = dirV2 (mkV "citi") ;

-red_A = mk4A "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 ;

@@ -166,11 +166,11 @@ rubber_N = mkNR "cauciuc";
  shirt_N = mkN "cămașă" "cămăși" ;

  shoe_N = mkN "pantof" masculine ;

  shop_N = mkN "magazin" ;

- short_A = regA "scurt" ; 

+ short_A = mkA "scurt" ; 

  silver_N = mkN "argint" masculine ;

  sister_N = mkAnim (mkN "soră" "surori") ;

  sleep_V = v_besch128 "dormi" ;

- small_A = mk4A "mic" "mică" "mici" "mici" ;

+ small_A = mkA "mic" "mică" "mici" "mici" ;

  snake_N = mkN "șarpe" "șerpi" masculine ;

  sock_N = mkN "șosetă" ;

  speak_V2 = dirV2 (mkV "vorbi") ;

@@ -179,7 +179,7 @@ rubber_N = mkNR "cauciuc";
  stone_N = mkN "piatră" "pietre" ;

  stove_N = mkN "sobă" ;

  student_N = mkAnim (mkN "student" masculine) ;

- stupid_A = regA "stupid" ;

+ stupid_A = mkA "stupid" ;

  sun_N = mkN "soare" "sori" masculine ;

  switch8off_V2 = dirV2 (v_besch77 "stinge") ;

  switch8on_V2 = dirV2 (mkV "aprinde") ;

@@ -189,22 +189,22 @@ rubber_N = mkNR "cauciuc";
  teach_V2 = dirV2 (v_besch57 "preda") ;

  television_N = mkN "televiziune" ;

  thick_A = mkRMut "gros" ;

- thin_A = regA "subțire" ;

+ thin_A = mkA "subțire" ;

  train_N = mkNR "tren";

  travel_V = mkV "călători" ;

  tree_N = mkN "copac" masculine ;

  --trousers_N = mkN "pantalon" masculine ;

- ugly_A = regA "urât" ;

+ 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") ;

  walk_V = v_besch90 "merge" ;

- warm_A = regA "calduț" ;

+ warm_A = mkA "calduț" ;

  war_N = mkN "război" neuter ;

  watch_V2 = dirV2 (mkV "privi") ;

  water_N = mkN "apă" ;

- white_A = regA "alb" ;

+ white_A = mkA "alb" ;

  window_N = mkN "fereastră" "ferestre" ;

  wine_N = mkNR "vin" ;

  win_V2 = dirV2 (v_besch17 "câștiga") ;

@@ -212,8 +212,8 @@ rubber_N = mkNR "cauciuc";
  wonder_VQ = mkVQ (mkRV (regV "minuna")) ;

  wood_N = mkN "lemn" ;

  write_V2 = dirV2 (v_besch117 "scrie") ;

- yellow_A = regA "galben" ;

- young_A = mk5A "tânăr" "tânără" "tineri" "tinere" "tinerește" ;

+ yellow_A = mkA "galben" ;

+ young_A = mkA "tânăr" "tânără" "tineri" "tinere" "tinerește" ;

 

   do_V2 = dirV2 (v_besch115 "face") ;

   now_Adv = mkAdv "acum" ; 

@@ -228,19 +228,19 @@ rubber_N = mkNR "cauciuc";
   left_Ord = mkOrd (regA "stâng") ;

   right_Ord = mkOrd (mkRMut "drept") ;

 far_Adv = mkAdv "departe" ;

-correct_A = regA "corect" ;

-dry_A = regA "uscat" ;

-dull_A = regA "monoton";

-full_A = regA "plin" ;

-heavy_A = mk4A "greu" "grea" "grei" "grele";

-near_A = regA "apropiat" ;

-rotten_A = regA "stricat" ;

-round_A = regA "rotund" ;

-sharp_A = regA "ascuțit" ;

-smooth_A = regA "neted" ;

+correct_A = mkA "corect" ;

+dry_A = mkA "uscat" ;

+dull_A = mkA "monoton";

+full_A = mkA "plin" ;

+heavy_A = mkA "greu" "grea" "grei" "grele";

+near_A = mkA "apropiat" ;

+rotten_A = mkA "stricat" ;

+round_A = mkA "rotund" ;

+sharp_A = mkA "ascuțit" ;

+smooth_A = mkA "neted" ;

 straight_A = mkRMut "drept" ;

-wet_A = regA "ud" ;

-wide_A = regA "adânc" ;

+wet_A = mkA "ud" ;

+wide_A = mkA "adânc" ;

   animal_N = mkN "animal" ;

   ashes_N = mkN "cenușă" "cenuși" ;

   back_N = mkN "spate" "spate" neuter ;

@@ -357,10 +357,10 @@ rule_N = mkN "regulă" "reguli" ;
 

 john_PN = mkPN "Ion" ;

 question_N = mkN "întrebare" ;

-ready_A = regA "pregătit" ;

+ready_A = mkA "pregătit" ;

 reason_N = mkN "motiv" ;

 today_Adv = mkAdv "astăzi" ;

-uncertain_A = regA "nesigur" ;

+uncertain_A = mkA "nesigur" ;

 

 

 } ;

diff --git a/next-lib/src/romanian/MorphoRon.gf b/next-lib/src/romanian/MorphoRon.gf
index c211121d3..2260dfb02 100644
--- a/next-lib/src/romanian/MorphoRon.gf
+++ b/next-lib/src/romanian/MorphoRon.gf
@@ -391,8 +391,7 @@ case s of
 

 mkFemSg : Str -> Str = \s ->

 case s of

-{x + "hi" => x + "he";

- x + "i"  => s + "e";

+{x + "i"  => s + "e";

  x + "iu" => x + "ie";

  x + "u"  => x + "ă";

  _        => s + "ă"