Commit 2d45d96f authored by Gérard Huet's avatar Gérard Huet

new roots k.s.nu and knuu; fix perfect forms of i

parent 1536b295
......@@ -2735,8 +2735,8 @@ value build_fem_aa stem entry =
enter entry (
[ Declined Noun Fem
[ (Singular, if entry = "ubha" then [] else let l =
[ if entry = "allaa" || entry = "akkaa"
then decline Voc "a"
[ if entry = "allaa" || entry = "akkaa" (* Pan{7,3,107} *)
then decline Voc "a"
else decline Voc "e"
; decline Nom "aa"
; decline Acc "aam"
......@@ -2746,9 +2746,9 @@ value build_fem_aa stem entry =
; decline Gen "aayaas"
; decline Loc "aayaam"
] in if entry = "ambaa" then
[ decline Voc "a" :: l ] (* also ambe vedic *)
[ decline Voc "a" :: l ] (* Pan{7,3,107} but also ambe vedic *)
else if entry = "guha" then (* guhaa fde guha *)
[ decline Loc "aa" :: l ] (* vedic *)
[ decline Loc "aa" :: l ] (* Vedic *)
else l)
; (Dual,
[ decline Voc "e"
......@@ -4952,7 +4952,8 @@ value compute_nouns_stem_form e stem d p =
| _ -> build_root Mas stem e
]
| [ 24 :: r1 ] (* -j *) -> match r1 with (* m.rjify *)
[ [ 2 :: [ 43 :: _ ] ] (* -raaj2 viraaj2 *)
[ [ 1 :: [ 43 :: _ ] ] (* -yaj2 upaya.t *)
| [ 2 :: [ 43 :: _ ] ] (* -raaj2 viraaj2 *)
| [ 2 :: [ 42 :: _ ] ] (* -yaaj2 *)
| [ 7; 48 ] (* s.rj2 *) -> build_root Mas [ 124 (* j' *) :: r1 ] e
| [ 5; 42 ] (* yuj2 *) -> do
......
......@@ -36,21 +36,21 @@ value voices_of = fun
| "ku.t" | "ku.n.th" | "kunth" | "kup" | "kul" | "kuuj" | "k.rt#1" | "k.rz"
| "krand" | "krii.d" | "kru~nc#1" | "krudh#1" | "kruz" | "klam" | "klid"
| "kliz" | "kvath" | "k.sar" | "k.sal" | "k.si" | "k.sii" | "k.su" | "k.sudh#1"
| "k.subh" | "k.svi.d" | "kha~nj#1" | "khaad" | "khid" | "khel" | "khyaa"
| "gaj" | "gad" | "garj" | "gard" | "gal" | "gaa#1" | "gaa#2" | "gu~nj"
| "gu.n.th" | "gup" | "gumph" | "g.rdh" | "g.rr#1" | "g.rr#2" | "granth"
| "grah" | "glai" | "ghas" | "ghu.s" | "gh.r" | "gh.r.s" | "ghraa" | "cakaas"
| "ca.t" | "cand" | "cam" | "car" | "cal" | "cit#1" | "cumb" | "chur"
| "ch.rd" | "jak.s" | "jap" | "jabh#2" | "jam" | "jalp" | "jas" | "jaag.r"
| "jinv" | "jiiv" | "jvar" | "jval" | "tak" | "tak.s" | "ta~nc"
| "tam" | "tarj" | "tup" | "tu.s" | "t.rp#1" | "t.r.s#1" | "t.rr" | "tyaj#1"
| "tras" | "tru.t" | "tvak.s" | "tsar" | "da.mz" | "dagh" | "dabh" | "dam#1"
| "dal" | "das" | "dah#1" | "daa#2" | "daa#3" | "diiv#1" | "du" | "du.s"
| "d.rp" | "d.rbh" | "d.rz#1" | "d.rh" | "d.rr" | "dhyaa" | "draa#1" | "dru#1"
| "druh#1" | "dham" | "dhaa#2" | "dhru" | "dhvan" | "dhv.r" | "na.t" | "nad"
| "nand" | "nam" | "nard" | "naz#1" | "nind" | "nu#1" | "n.rt" | "pa.t"
| "pat#1" | "path" | "paa#1" | "paa#2" | "pi#2" | "piz#1" | "pi.s" | "pu.t"
| "p.r#1" | "p.r.s" | "p.rr" | "praa#1" | "phal"
| "k.subh" | "k.s.nu" | "k.svi.d" | "kha~nj#1" | "khaad" | "khid" | "khel"
| "khyaa" | "gaj" | "gad" | "garj" | "gard" | "gal" | "gaa#1" | "gaa#2"
| "gu~nj" | "gu.n.th" | "gup" | "gumph" | "g.rdh" | "g.rr#1" | "g.rr#2"
| "granth" | "grah" | "glai" | "ghas" | "ghu.s" | "gh.r" | "gh.r.s"
| "ghraa" | "cakaas" | "ca.t" | "cand" | "cam" | "car" | "cal" | "cit#1"
| "cumb" | "chur" | "ch.rd" | "jak.s" | "jap" | "jabh#2" | "jam" | "jalp"
| "jas" | "jaag.r" | "jinv" | "jiiv" | "jvar" | "jval" | "tak" | "tak.s"
| "ta~nc" | "tam" | "tarj" | "tup" | "tu.s" | "t.rp#1" | "t.r.s#1" | "t.rr"
| "tyaj#1" | "tras" | "tru.t" | "tvak.s" | "tsar" | "da.mz" | "dagh"
| "dabh" | "dam#1" | "dal" | "das" | "dah#1" | "daa#2" | "daa#3" | "diiv#1"
| "du" | "du.s" | "d.rp" | "d.rbh" | "d.rz#1" | "d.rh" | "d.rr" | "dhyaa"
| "draa#1" | "dru#1" | "druh#1" | "dham" | "dhaa#2" | "dhru" | "dhvan"
| "dhv.r" | "na.t" | "nad" | "nand" | "nam" | "nard" | "naz#1" | "nind"
| "nu#1" | "n.rt" | "pa.t" | "pat#1" | "path" | "paa#1" | "paa#2" | "pi#2"
| "piz#1" | "pi.s" | "pu.t" | "p.r#1" | "p.r.s" | "p.rr" | "praa#1" | "phal"
| "bal" | "b.rh#1" | "b.rh#2" | "bha~nj" | "bha.n" | "bha.s"
| "bhas" | "bhaa#1" | "bhii#1" | "bhuj#1" | "bhuu#1" | "bhuu.s" | "bhram"
| "majj" | "ma.n.d" | "mad#1" | "manth" | "mah" | "maa#3" | "mi.s" | "mih"
......@@ -88,7 +88,7 @@ value voices_of = fun
| "az#1" | "aas#2" | "indh" | "iik.s" | "ii.d" | "iir" | "iiz#1" | "ii.s"
| "iih" | "edh" | "katth" | "kam" | "kamp" | "kaaz" | "kaas#1" | "kuu"
| "k.rp" | "k.lp" (* but Henry: {cak.lpur} "ils s'arrangèrent" *)
| "klav" | "k.sad" | "k.sam" | "galbh" | "gaah" | "gur" | "gha.t"
| "knuu" | "klav" | "k.sad" | "k.sam" | "galbh" | "gaah" | "gur" | "gha.t"
| "jabh#1" | "ju.s#1" | "j.rmbh" | ".damb" | ".dii" | "tandr" | "tij" | "trap"
| "trai" | "tvar" | "dak.s" | "day" | "diik.s" | "diip" | "d.r#1" | "dhii#1"
| "dhuk.s" | "pa.n" | "pad#1" | "pi~nj" | "p.r#2" | "pyaa" | "prath"
......@@ -171,7 +171,7 @@ svid2 1A 4P
(* More precise selection for present system *)
value voices_of_gana g root = match g with
[ 1 -> match root with
[ ".r" | "k.r.s" | "cur" | "tap" | "budh#1" | "van" | "v.r#1" | "su#2"
[ "k.r.s" | "cur" | "budh#1" | "van" | "v.r#1" | "su#2"
| "suu#1"
-> Para
| "i" | "gha.t.t" | "ghuur.n" | ".damb" | "bhra.mz" | "mid" | "mok.s"
......
......@@ -234,7 +234,7 @@ value light_10 = fun (* light roots end in short vowel Pan{1,4,11} *)
[ [] -> failwith "light_10"
| [ c :: r ] -> if vowel c then False (* ? *) else match r with
[ [] -> failwith "light_10_1"
| [ v :: _ ] -> if short_vowel v then True else False
| [ v :: _ ] -> short_vowel v
]
]
;
......
This diff is collapsed.
......@@ -8,4 +8,4 @@
(**************************************************************************)
(* Generated by make version - see main Makefile *)
value version="3.09" and version_date="2018-10-27";
value version="3.09" and version_date="2018-11-06";
VERSION='3.09'
DATE='2018-10-27'
DATE='2018-11-06'
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment