adjustments in Phrasebook and synopsis

This commit is contained in:
aarne
2011-12-08 14:04:42 +00:00
parent c20745480f
commit 2cc65efff8
16 changed files with 271 additions and 236 deletions

View File

@@ -44,7 +44,7 @@ lin
married_A2 = mkA2 (mkA "getrouwd") (mkPrep "met") ;
mother_N2 = mkN2 (mkN "moeder") ;
now_Adv = mkAdv "nu" ;
paint_V2A = mkV2A (mkV "schilderen") noPrep ;
paint_V2A = mkV2A (mkV "schilderen" "schildert") noPrep ;
paris_PN = mkPN "Parijs" ;
red_A = mkA "rood" ;
say_VS = mkVS zeggen_V ;
@@ -196,7 +196,7 @@ laugh_V = lachen_V ;
leaf_N = mkN "blad" neuter ;
learn_V2 = mkV2 "leren" ;
leather_N = mkN "leer" neuter ;
leave_V2 = mkV2 laten_V ;
leave_V2 = mkV2 (mkV "verlaten" "verliet" "verlieten" "verlaten") ;
leg_N = mkN "been" neuter ;
lie_V = liggen_V ;
like_V2 = mkV2 houden_V van_Prep ;

View File

@@ -116,6 +116,7 @@ oper
mkV : overload {
mkV : (aaien : Str) -> V ; -- regular verb
mkV : (aaien,aait : Str) -> V ; -- regular verb with third person sg pres (giving stem)
mkV : (breken,brak,gebroken : Str) -> V ; -- theme of irregular verb
mkV : (breken,brak,braken,gebroken : Str) -> V ; -- also past plural irregular
mkV : (aai,aait,aaien,aaide,aaide,aaiden,geaaid : Str) -> V ; -- worst-case verb
@@ -216,6 +217,8 @@ oper
mkV = overload {
mkV : (aaien : Str) -> V =
\s -> lin V (v2vv (regVerb s)) ;
mkV : (aaien, aait : Str) -> V =
\s,t -> lin V (v2vv (smartVerb s (init t))) ;
mkV : (breken,brak,gebroken : Str) -> V =
\a,b,c -> lin V (v2vv (irregVerb a b c)) ;
mkV : (breken,brak,braken,gebroken : Str) -> V =

View File

@@ -224,7 +224,7 @@ resource ResDut = ParamX ** open Prelude in {
-- For regular verbs with past tense 'd'
d_regVerb : (_,_ :Str) -> Verb = \geeuwen,geeuw ->
let stem = mkStem geeuwen
let stem = geeuw --- mkStem geeuwen
in
mkVerb stem (stem + "t") geeuwen
(stem + "de") (stem + "de") (stem + "den")