dutch complete, verbs verified in the lexicon

lib/src/dutch/LexiconDut.gf

@@ -30,13 +30,13 @@ lin
   come_V = zijnV (mkV "kom" "komt" "komen" "kwam" "kwame" "gekomen") ;
   die_V = zijnV (mkV "sterven" "stierf" "gestorven") ;
   distance_N3 = mkN3 (mkN "afstand") van_Prep (mkPrep "naar") ;
-  drink_V2 = mkV2 (mkV "drinken" "dronk" "gedronken") ;
+  drink_V2 = mkV2 drinken_V ;
   easy_A2V = mkA2 (mkA "gemakkelijk") noPrep ;
-  eat_V2 = mkV2 (mkV "eten" "at" "gegeten") ;
+  eat_V2 = mkV2 eten_V ;
   father_N2 = mkN2 (mkN "vader") van_Prep ;
   fear_VS = mkVS (mkV "vrezen") ;
   fish_N = mkN "vis" ;
-  go_V = zijnV (mkV "gaan" "ging" "gegaan") ;
+  go_V = zijnV gaan_V ;
   hope_VS = mkVS (mkV "hopen") ;
   house_N = mkN "huis" neuter ;
   know_VS = mkVS weten_V ;
@@ -47,17 +47,17 @@ lin
   paris_PN = mkPN "Parijs" ;
   red_A = mkA "rood" ;
   say_VS = mkVS zeggen_V ;
-  see_V2 = mkV2 (mkV "zien" "zag" "gezien") ;
+  see_V2 = mkV2 zien_V ;
   sell_V3 = mkV3 (mkV "verkopen" "verkocht" "verkocht") ;
   send_V3 = mkV3 (mkV "sturen") ;
-  sleep_V = mkV "slapen" "sliep" "geslapen" ;
+  sleep_V = slapen_V ;
   small_A = mkA "klein" ;
   talk_V3 = mkV3 (mkV "praten") (mkPrep "met") (mkPrep "over") ;
   warm_A = mkA "warm" ;
   wine_N = mkN "wijn" ;
   john_PN = mkPN "Jan" ;
---  left_Ord = Mo.mkOrd (mkA "link") ;
+  left_Ord = mkOrd (invarA "linker") ; ----
---  right_Ord = Mo.mkOrd (mkA "recht") ;
+  right_Ord = mkOrd (invarA "rechter") ; ----
   today_Adv = mkAdv "vandaag" ;
   far_Adv = mkAdv "ver" ;
   give_V3 = mkV3 geven_V ;
@@ -70,36 +70,26 @@ art_N = mkN "kunst" utrum ;
 ashes_N = mkN "as" utrum ;
 baby_N = mkN "baby" utrum ;
 back_N = mkN "achterkant" utrum ;
--- bad_A = mkA "slecht" ;
 bank_N = mkN "bank" utrum ;
 bark_N = mkN "schors" utrum ;
--- beautiful_A = mkA "prachtig" ;
--- beer_N = mkN "bier" neuter ;
 belly_N = mkN "buik" utrum ;
--- big_A = mkA "groot" ;
--- bike_N = mkN "fiets" utrum ;
 bird_N = mkN "vogel" utrum ;
-bite_V2 = mkV2 "bijen" ;
+bite_V2 = mkV2 bijten_V ;
--- black_A = mkA "zwart" ;
+black_A = mkA "zwart" ;
 blood_N = mkN "bloed" neuter ;
--- blow_V = mkV "slageen" ;
+blow_V = blazen_V ;
-blow_V = mkV "waaien" ;
--- blue_A = mkA "blauw" ;
 boat_N = mkN "boot" utrum ;
 bone_N = mkN "bot" neuter ;
--- book_N = mkN "boek" neuter ;
 boot_N = mkN "boot" utrum ;
 boss_N = mkN "baas" utrum ;
 boy_N = mkN "jongen" utrum ;
 bread_N = mkN "brood" neuter ;
-break_V2 = mkV2 "breeken" ;
+break_V2 = mkV2 breken_V ;
 breast_N = mkN "borst" utrum ;
 breathe_V = mkV "ademen" ;
 broad_A = mkA "breed" ;
--- brown_A = mkA "bruin" ;
+burn_V = mkV "branden" ;
-burn_V = mkV "brandwondeen" ;
 butter_N = mkN "boter" utrum ;
--- buy_V2 = mkV2 "koopen" ;
 camera_N = mkN "camera" utrum ;
 cap_N = mkN "kap" utrum ;
 car_N = mkN "auto" utrum ;
@@ -108,65 +98,56 @@ cat_N = mkN "kat" utrum ;
 ceiling_N = mkN "plafond" neuter ;
 chair_N = mkN "stoel" utrum ;
 cheese_N = mkN "kaas" utrum ;
--- child_N = mkN "kind" neuter ;
 church_N = mkN "kerk" utrum ;
 city_N = mkN "stad" utrum ;
 clean_A = mkA "schoon" ;
 clever_A = mkA "slim" ;
-close_V2 = mkV2 "sluien" ;
+close_V2 = mkV2 sluiten_V ;
 cloud_N = mkN "wolk" utrum ;
 coat_N = mkN "vacht" utrum ;
 cold_A = mkA "koud" ;
--- come_V = mkV "komen" ;
 computer_N = mkN "computer" utrum ;
 correct_A = mkA "correct" ;
-count_V2 = mkV2 "telen" ;
+count_V2 = mkV2 "rekenen" ;
 country_N = mkN "land" neuter ;
 cousin_N = mkN "neef" utrum ;
 cow_N = mkN "koe" utrum ;
-cut_V2 = mkV2 "snijden" ;
+cut_V2 = mkV2 snijden_V ;
 day_N = mkN "dag" utrum ;
--- die_V = mkV "sterfen" ;
+dig_V = graven_V ;
-dig_V = mkV "graafen" ;
--- dig_V = mkV "opgravingeen" ;
 dirty_A = mkA "vuil" ;
 do_V2 = mkV2 doen_V ;
--- do_V2 = mkV2 "heefen" ;
 doctor_N = mkN "arts" utrum ;
 dog_N = mkN "hond" utrum ;
 door_N = mkN "deur" utrum ;
--- drink_V2 = mkV2 "drankeen" ;
 dry_A = mkA "droog" ;
 dull_A = mkA "saai" ;
 dust_N = mkN "stof" neuter ;
 ear_N = mkN "oor" neuter ;
 earth_N = mkN "aarde" utrum ;
--- eat_V2 = mkV2 "eeen" ;
 egg_N = mkN "ei" neuter ;
 empty_A = mkA "leeg" ;
 enemy_N = mkN "vijand" utrum ;
 eye_N = mkN "oog" neuter ;
 factory_N = mkN "fabriek" utrum ;
-fall_V = mkV "valen" ;
+fall_V = vallen_V ;
 fat_N = mkN "vet" neuter ;
-fear_V2 = mkV2 "vreesen" ;
+fear_V2 = mkV2 "vrezen" ;
 feather_N = mkN "veer" utrum ;
-fight_V2 = mkV2 "vechen" ;
+fight_V2 = mkV2 vechten_V ;
-find_V2 = mkV2 "vinden" ;
+find_V2 = mkV2 vinden_V ;
 fingernail_N = mkN "vingernagel" utrum ;
 fire_N = mkN "brand" utrum ;
--- fish_N = mkN "vis" utrum ;
+float_V = drijven_V ;
-float_V = mkV "drijfen" ;
 floor_N = mkN "vloer" utrum ;
--- flow_V = mkV "stromeen" ;
+flow_V = mkV "stromen" ;
-flow_V = mkV "stroomen" ;
 flower_N = mkN "bloem" utrum ;
-fly_V = mkV "vliegen" ;
+fly_V = vliegen_V ;
 fog_N = mkN "mist" utrum ;
 foot_N = mkN "voet" utrum ;
 forest_N = mkN "bos" neuter ;
-forget_V2 = mkV2 "vergeeen" ;
+forget_V2 = mkV2 vergeten_V ;
-freeze_V = mkV "bevriesen" ;
+freeze_V = vriezen_V ;
 fridge_N = mkN "koelkast" utrum ;
 friend_N = mkN "vriend" utrum ;
 fruit_N = mkN "vrucht" utrum ;
@@ -175,7 +156,6 @@ fun_AV = mkA "leuk" ;
 garden_N = mkN "tuin" utrum ;
 girl_N = mkN "meisje" neuter ;
 glove_N = mkN "handschoen" utrum ;
--- go_V = mkV "gaaen" ;
 gold_N = mkN "goud" neuter ;
 good_A = mkA "goed" ;
 grammar_N = mkN "grammatica" utrum ;
@@ -186,48 +166,47 @@ hair_N = mkN "haar" neuter ;
 hand_N = mkN "hand" utrum ;
 harbour_N = mkN "haven" utrum ;
 hat_N = mkN "hoed" utrum ;
-hate_V2 = mkV2 "heefen" ;
+hate_V2 = mkV2 "haten" ;
 head_N = mkN "hoofd" neuter ;
-hear_V2 = mkV2 "hooren" ;
+hear_V2 = mkV2 "horen" ;
 heart_N = mkN "hart" neuter ;
 heavy_A = mkA "zwaar" ;
 hill_N = mkN "heuvel" utrum ;
-hit_V2 = mkV2 "raaken" ;
+hit_V2 = mkV2 "raken" ;
-hold_V2 = mkV2 "heefen" ;
+hold_V2 = mkV2 houden_V ;
 horn_N = mkN "hoorn" utrum ;
 horse_N = mkN "paard" neuter ;
 hot_A = mkA "hot" ;
--- house_N = mkN "huis" neuter ;
+hunt_V2 = mkV2 "jagen" ;
-hunt_V2 = mkV2 "jaagen" ;
 husband_N = mkN "man" utrum ;
 ice_N = mkN "ijs" neuter ;
 important_A = mkA "belangrijk" ;
 industry_N = mkN "industrie" utrum ;
 iron_N = mkN "ijzer" neuter ;
-jump_V = mkV "springen" ;
+jump_V = springen_V ;
 kill_V2 = mkV2 "dooden" ;
 king_N = mkN "koning" utrum ;
 knee_N = mkN "knie" utrum ;
-know_V2 = mkV2 "kenen" ;
+know_V2 = mkV2 "kennen" ;
 lake_N = mkN "meer" neuter ;
 lamp_N = mkN "lamp" utrum ;
 language_N = mkN "taal" utrum ;
-laugh_V = mkV "lachen" ;
+laugh_V = lachen_V ;
 leaf_N = mkN "blad" neuter ;
-learn_V2 = mkV2 "leeren" ;
+learn_V2 = mkV2 "leren" ;
 leather_N = mkN "leer" neuter ;
-leave_V2 = mkV2 "laaen" ;
+leave_V2 = mkV2 laten_V ;
 leg_N = mkN "been" neuter ;
-lie_V = mkV "ligen" ;
+lie_V = liggen_V ;
-like_V2 = mkV2 "houden" ;
+like_V2 = mkV2 houden_V van_Prep ;
 listen_V2 = mkV2 "luisteren" ;
-live_V = mkV "leveen" ;
+live_V = mkV "leven" ;
 liver_N = mkN "lever" utrum ;
 long_A = mkA "lang" ;
-lose_V2 = mkV2 "verliesen" ;
+lose_V2 = mkV2 verliezen_V ;
 louse_N = mkN "luis" utrum ;
 love_N = mkN "liefde" utrum ;
-love_V2 = mkV2 "houden" ;
+love_V2 = mkV2 (mkV "lief" hebben_V) ;
 man_N = mkN "man" utrum ;
 meat_N = mkN "vlees" neuter ;
 milk_N = mkN "melk" utrum ;
@@ -253,20 +232,20 @@ pen_N = mkN "pen" utrum ;
 person_N = mkN "persoon" utrum ;
 planet_N = mkN "planeet" utrum ;
 plastic_N = mkN "plastic" utrum ;
-play_V = mkV "speelen" ;
+play_V = mkV "spelen" ;
-play_V2 = mkV2 "speelen" ;
+play_V2 = mkV2 "spelen" ;
 policeman_N = mkN "politieagent" utrum ;
 priest_N = mkN "priester" utrum ;
 probable_AS = mkA "waarschijnlijk" ;
-pull_V2 = mkV2 "treken" ;
+pull_V2 = mkV2 "trekken" ;
 push_V2 = mkV2 "duwen" ;
-put_V2 = mkV2 "zeen" ;
+put_V2 = mkV2 "zetten" ;
 queen_N = mkN "koningin" utrum ;
 question_N = mkN "vraag" utrum ;
 radio_N = mkN "radio" utrum ;
 rain_N = mkN "regen" utrum ;
 rain_V0 = mkV "regenen" ;
-read_V2 = mkV2 "leesen" ;
+read_V2 = mkV2 lezen_V ;
 ready_A = mkA "klaar" ;
 reason_N = mkN "reden" utrum ;
 -- red_A = mkA "rood" ;
@@ -280,19 +259,18 @@ root_N = mkN "wortel" utrum ;
 rope_N = mkN "touw" neuter ;
 rotten_A = mkA "verrot" ;
 round_A = mkA "rond" ;
-rub_V2 = mkV2 "wrijfen" ;
+rub_V2 = mkV2 wrijven_V ;
 rubber_N = mkN "rubberen" utrum ;
 rule_N = mkN "regel" utrum ;
-run_V = mkV "draaien" ;
+run_V = lopen_V ;
 salt_N = mkN "zout" neuter ;
 sand_N = mkN "zand" neuter ;
 school_N = mkN "school" utrum ;
 science_N = mkN "wetenschap" utrum ;
-scratch_V2 = mkV2 "krasseen" ;
+scratch_V2 = mkV2 "krassen" ;
 sea_N = mkN "zee" utrum ;
--- see_V2 = mkV2 "zieen" ;
 seed_N = mkN "zaad" neuter ;
-seek_V2 = mkV2 "wien" ;
+seek_V2 = mkV2 zoeken_V ;
 sew_V = mkV "naaien" ;
 sharp_A = mkA "scherp" ;
 sheep_N = mkN "schaap" neuter ;
@@ -302,84 +280,80 @@ shoe_N = mkN "schoen" utrum ;
 shop_N = mkN "winkel" utrum ;
 short_A = mkA "kort" ;
 silver_N = mkN "zilver" neuter ;
-sing_V = mkV "zingen" ;
+sing_V = zingen_V ;
 sister_N = mkN "zuster" utrum ;
-sit_V = mkV "zien" ;
+sit_V = zitten_V ;
 skin_N = mkN "huid" utrum ;
 sky_N = mkN "lucht" utrum ;
--- sleep_V = mkV "slaapen" ;
+smell_V = ruiken_V ;
--- small_A = mkA "klein" ;
-smell_V = mkV "geureen" ;
 smoke_N = mkN "rook" utrum ;
 smooth_A = mkA "glad" ;
 snake_N = mkN "slang" utrum ;
 snow_N = mkN "sneeuw" utrum ;
 sock_N = mkN "sok" utrum ;
 song_N = mkN "liedje" neuter ;
-speak_V2 = mkV2 "spreeken" ;
+speak_V2 = mkV2 spreken_V ;
-spit_V = mkV "spuugen" ;
+spit_V = mkV "spugen" ;
-split_V2 = mkV2 "splitsen" ;
+split_V2 = mkV2 splijten_V ;
-squeeze_V2 = mkV2 "knijpen" ;
+squeeze_V2 = mkV2 knijpen_V ;
-stab_V2 = mkV2 "steeken" ;
+stab_V2 = mkV2 steken_V ;
-stand_V = mkV "staaen" ;
+stand_V = staan_V ;
 star_N = mkN "ster" utrum ;
 steel_N = mkN "staal" neuter ;
 stick_N = mkN "stok" utrum ;
 stone_N = mkN "steen" utrum ;
-stop_V = mkV "stopen" ;
+stop_V = mkV "stoppen" ;
 stove_N = mkN "kachel" utrum ;
 straight_A = mkA "recht" ;
 student_N = mkN "student" utrum ;
 stupid_A = mkA "dom" ;
-suck_V2 = mkV2 "zuigen" ;
+suck_V2 = mkV2 zuigen_V ;
 sun_N = mkN "zon" utrum ;
 swell_V = mkV "zwelen" ;
 swim_V = mkV "zwemen" ;
 switch8off_V2 = mkV2 "schakelen" ;
-switch8on_V2 = mkV2 "oen" ;
+switch8on_V2 = mkV2 (mkV "op" (mkV "schakelen")) ;
 table_N = mkN "tabel" utrum ;
 tail_N = mkN "staart" utrum ;
-teach_V2 = mkV2 "leeren" ;
+teach_V2 = mkV2 "leren" ;
 teacher_N = mkN "leraar" utrum ;
 television_N = mkN "televisie" utrum ;
 thick_A = mkA "dik" ;
 thin_A = mkA "dun" ;
-think_V = mkV "denken" ;
+think_V = denken_V ;
 throw_V2 = mkV2 "gooien" ;
-tie_V2 = mkV2 "bandeen" ;
+tie_V2 = mkV2 "banden" ;
 tongue_N = mkN "tong" utrum ;
 tooth_N = mkN "tand" utrum ;
 train_N = mkN "trein" utrum ;
-travel_V = mkV "reizeen" ;
+travel_V = mkV "reizen" ;
 tree_N = mkN "boom" utrum ;
 turn_V = mkV "draaien" ;
 ugly_A = mkA "lelijk" ;
 uncertain_A = mkA "onzeker" ;
-understand_V2 = mkV2 "begrijpen" ;
+understand_V2 = mkV2 (mkV "begrijpen" "begreep" "begrepen" "begrepen") ;
 university_N = mkN "universiteit" utrum ;
 village_N = mkN "dorp" neuter ;
-vomit_V = mkV "braaken" ;
+vomit_V = mkV "braken" ;
 wait_V2 = mkV2 "wachen" ;
-walk_V = mkV "wandelingeen" ;
+walk_V = mkV "lopen" ;
 war_N = mkN "oorlog" utrum ;
--- warm_A = mkA "warm" ;
+wash_V2 = mkV2 wassen_V ;
-wash_V2 = mkV2 "spoelen" ;
 watch_V2 = mkV2 "horlogeen" ;
 water_N = mkN "water" neuter ;
 wet_A = mkA "nat" ;
 white_A = mkA "wit" ;
 wide_A = mkA "breed" ;
 wife_N = mkN "vrouw" utrum ;
-win_V2 = mkV2 "winen" ;
+win_V2 = mkV2 winnen_V ;
 wind_N = mkN "wind" utrum ;
 window_N = mkN "raam" neuter ;
--- wine_N = mkN "wijn" utrum ;
 wing_N = mkN "vleugel" utrum ;
-wipe_V2 = mkV2 "veegen" ;
+wipe_V2 = mkV2 "vegen" ;
 woman_N = mkN "vrouw" utrum ;
 wood_N = mkN "hout" neuter ;
 worm_N = mkN "worm" utrum ;
-write_V2 = mkV2 "schrijfen" ;
+write_V2 = mkV2 schrijven_V ;
 year_N = mkN "jaar" neuter ;
 yellow_A = mkA "geel" ;
 young_A = mkA "jong" ;

lib/src/dutch/ParadigmsDut.gf

@@ -23,7 +23,7 @@
 resource ParadigmsDut = open 
   (Predef=Predef), 
   Prelude, 
-  MorphoDut,
+  ResDut,
   CatDut
   in 
 {
@@ -102,10 +102,11 @@ oper
     mkA : (goed,goede,goeds,beter,best : Str) -> A = \a,b,c,d,e -> lin A (mkAdjective a b c d e) ;
     } ;
 
----- Invariable adjective are a special case. 
+-- Invariable adjective are a special case. 
---
+
---  invarA : Str -> A ;            -- prima
+  invarA : Str -> A ;            -- prima
---
+
+
 ---- Two-place adjectives are formed by adding a preposition to an adjective.
 
   mkA2 : A -> Prep -> A2 ;
@@ -163,6 +164,9 @@ oper
   reflV  : V -> V ;
   reflV v = lin V {s = v.s ; aux = v.aux ; prefix = v.prefix ; vtype = VRefl} ;
 
+  zijn_V : V = lin V ResDut.zijn_V ;
+  hebben_V : V = lin V ResDut.hebben_V ;
+
 --3 Two-place verbs
 
   mkV2 : overload {
@@ -226,6 +230,9 @@ oper
 --  AS, A2S, AV, A2V : Type ;
 --
 --
+
+  mkOrd : A -> Ord = \a -> lin Ord {s = a.s ! Posit} ;
+
 ----.
 ----2 Definitions of paradigms
 ----
@@ -322,9 +329,9 @@ oper
 --    _ + "e"    => mk3A a (a + "r") (a + "ste") ;
 --    _          => mk3A a (a + "er") (a + "este")
 --    } ;
---
+
---  invarA = \s -> {s = \\_,_ => s ; lock_A = <>} ; ---- comparison
+  invarA = \s -> lin A {s = \\_,_ => s} ; ---- comparison
---
+
   mkA2 = \a,p -> lin A2 (a ** {c2 = p.s}) ;
 
   mkAdv s = {s = s ; lock_Adv = <>} ;

lib/src/dutch/ResDut.gf

@@ -477,11 +477,10 @@ param
   predVGen : Bool -> VVerb -> VP = \isAux, verb -> {
     s = verb ;
     a1  : Polarity => Str = negation ;
-    n2  : Agr => Str = \\_ => [] ;
+    n2  : Agr => Str = \\a => case verb.vtype of {
--- case verb.vtype of {
+      VAct  => [] ;
---      VAct => \\_ => [] ;
+      VRefl => reflPron ! a
---      VRefl c => \\a => reflPron ! a ! c
+      } ;
---      } ;
     a2  : Str = [] ;
     isAux = isAux ; ----
     inf,ext : Str = []