diff --git a/DOC/Heritage_Platform.pdf b/DOC/Heritage_Platform.pdf index 13ca586cfb83cb1d8d78b4963555ed475501a239..384f9379021bbdf6c24acabcc98d8bf1c82e66e5 100644 Binary files a/DOC/Heritage_Platform.pdf and b/DOC/Heritage_Platform.pdf differ diff --git a/DOC/Heritage_Platform.tex b/DOC/Heritage_Platform.tex index 29d7c61964783a0f753279406ffde7c9f2987d40..017c64e1f8825f91db9ce252d493352714aa2b17 100644 --- a/DOC/Heritage_Platform.tex +++ b/DOC/Heritage_Platform.tex @@ -14,7 +14,7 @@ \vspace*{24pt} {\Large The Sanskrit Platform Documentation}\\[10pt] {\Large (Sanskrit Library V3.07; Zen toolkit V3.1)}\\[15pt] -{\large 2018-05-21}\\[15pt] +{\large 2018-05-26}\\[15pt] {\large G\'erard Huet \& Pawan Goyal}\\[10pt] {\large Copyright \copyright ~2000-2018 Inria}\\[20pt] \end{center} @@ -99,7 +99,7 @@ Generated by make version - see main Makefile \label{version.ml:671}% \medskip \ocwbegincode{}\ocwindent{0.00em} -$\ocwlowerid{value}~\ocwlowerid{version}=$\ocwstring{"3.07"}~\ocwkw{and}~$\ocwlowerid{version\_date}=$\ocwstring{"2018\symbol{45}05\symbol{45}21"};\ocweol +$\ocwlowerid{value}~\ocwlowerid{version}=$\ocwstring{"3.07"}~\ocwkw{and}~$\ocwlowerid{version\_date}=$\ocwstring{"2018\symbol{45}05\symbol{45}26"};\ocweol \ocweol \ocwendcode{}\typeout{OcamlWeb file Date.ml} \ocwmodule{Date} @@ -46813,6 +46813,8 @@ $\mid{}~$\ocwstring{"pi\#2"}~$\rightarrow{}~$\ocwstring{"increase"}\ocweol \ocwindent{1.00em} $\mid{}~$\ocwstring{"praz"}~$\rightarrow{}~$\ocwstring{"ask"}\ocweol \ocwindent{1.00em} +$\mid{}~$\ocwstring{"bhaa.s"}~$\rightarrow{}~$\ocwstring{"talk"}\ocweol +\ocwindent{1.00em} $\mid{}~$\ocwstring{"tarj"}~\ocweol \ocwindent{1.00em} $\mid{}~$\ocwstring{"bharts"}~$\rightarrow{}~$\ocwstring{"threaten"}\ocweol @@ -46831,6 +46833,8 @@ $\mid{}~$\ocwstring{"v.rt\#1"}~$\rightarrow{}~$\ocwstring{"exist"}\ocweol \ocwindent{1.00em} $\mid{}~$\ocwstring{"v.r.s"}~$\rightarrow{}~$\ocwstring{"rain"}\ocweol \ocwindent{1.00em} +$\mid{}~$\ocwstring{"zubh\#1"}~$\rightarrow{}~$\ocwstring{"shine"}\ocweol +\ocwindent{1.00em} $\mid{}~$\ocwstring{"sp.rz\#1"}~$\rightarrow{}~$\ocwstring{"touch"}\ocweol \ocwindent{1.00em} $\mid{}~$\ocwstring{"svid\#2"}~$\rightarrow{}~$\ocwstring{"sweat"}\ocweol diff --git a/ML/paraphrase.ml b/ML/paraphrase.ml index 5b252b98688f4952e1170484aa5eb34f2e775372..f368eb85deba9d43c8605bd76f563b0b4a1a1ad0 100644 --- a/ML/paraphrase.ml +++ b/ML/paraphrase.ml @@ -71,6 +71,7 @@ value reg_stem = fun (* regular english verbs paraphrase *) | "paa#2" -> "protect" | "pi#2" -> "increase" | "praz" -> "ask" + | "bhaa.s" -> "talk" | "tarj" | "bharts" -> "threaten" | "bruu" -> "say" @@ -80,6 +81,7 @@ value reg_stem = fun (* regular english verbs paraphrase *) | "lal" -> "fondle" | "v.rt#1" -> "exist" | "v.r.s" -> "rain" + | "zubh#1" -> "shine" | "sp.rz#1" -> "touch" | "svid#2" -> "sweat" | _ -> raise Unknown diff --git a/ML/verbs.ml b/ML/verbs.ml index 92a58b7518f95b02395b4ec2a2eca7bd997581d6..dbfab1d646f98da47681586135fc1ab4537fbb8a 100644 --- a/ML/verbs.ml +++ b/ML/verbs.ml @@ -4679,6 +4679,7 @@ value record_abso_am root = | "kram" -> record "kraamam" | "k.r#1" -> record "kaaram" (* \Pan{3,4,26-28} *) | "khan" -> record "khaanam" + | "j~naa#1" -> record "j~naayam" | "t.r.s#1" -> record "tar.sam" | "daa#1" -> record "daayam" | "paa#1" -> record "paayam" @@ -5565,11 +5566,6 @@ value compute_conjugs_stems entry (vmorph,aa) = do (* main *) record_pfp_aniiya Causative cpstem entry (* Passive past participle and absolutives *) ; record_pppca cpstem cstem entry - ; match entry with (* additional forms *) - [ "j~naa#1" -> let st = revcode "j~nap" in (* optional j~napita *) - record_pppca st st entry (* vet \Pan{7,2,27} *) - | _ -> () - ] (* Periphrastic future, Infinitive, Gerundive/pfp in -tavya *) ; perif Causative icstem entry (* Periphrastic perfect Whitney§1045 *) @@ -5706,6 +5702,14 @@ value compute_extra_car () = do ; enter1 "car" (Absotvaa Primary (code "ciirtvaa")) ; enter1 "car" (Invar (Primary,Infi) (code "cartum")) (* epic *) } + and compute_extra_jnaa () = + let entry = "j~naa#1" in (* j~napta vet \Pan{7,2,27} *) + let cstem = revcode "j~nap" in + let ppstem = [ 1 :: [ 32 :: cstem ] ] (* j~napta *) in do + { record_part (Ppp_ Causative ppstem entry) + ; record_part (Pppa_ Causative [ 45 :: ppstem ] entry) (* pp-vat *) + ; perif Causative cstem entry + } and compute_extra_zru () = enter1 "zru" (* ved écoute *) (Conju (impera 5) [ (Singular,[ (Second, code "zrudhi") ]) ]) @@ -5794,6 +5798,7 @@ value compute_extra () = do ; compute_extra_khan () ; compute_extra_car () ; compute_extra_cud () + ; compute_extra_jnaa () ; compute_extra_dhaa () ; compute_extra_nind () ; compute_extra_prr () @@ -5841,7 +5846,8 @@ value fake_compute_conjugs (gana : int) (entry : string) = do | "gup" -> record_part_ppp (revcode "gupta") entry | "car" -> compute_extra_car () | "cud" -> compute_extra_cud () - | "dhaa#1" -> compute_extra_dhaa () + | "j~naa#1"-> compute_extra_jnaa () + | "dhaa#1" -> compute_extra_dhaa () | "nind" -> compute_extra_nind () | "p.rr" -> compute_extra_prr () | "bhaa.s" -> compute_extra_bhaas () diff --git a/ML/version.ml b/ML/version.ml index 1a1f15294f250a2842aedec905b80b597348e6a3..17befedc7fee93419e40bb58e9b5aa7e4a53b037 100644 --- a/ML/version.ml +++ b/ML/version.ml @@ -8,4 +8,4 @@ (**************************************************************************) (* Generated by make version - see main Makefile *) -value version="3.07" and version_date="2018-05-21"; +value version="3.07" and version_date="2018-05-26"; diff --git a/SETUP/version.txt b/SETUP/version.txt index 170291055de252e3e0b1f3fe84ddda30e78f81de..673ba242d74899092f5895cf2fff25f896e078d9 100644 --- a/SETUP/version.txt +++ b/SETUP/version.txt @@ -1,2 +1,2 @@ VERSION='3.07' -DATE='2018-05-21' +DATE='2018-05-26' diff --git a/SITE/portal.html b/SITE/portal.html index b0f4e809d13a920243ef26efbd5affb2aab87e51..5080d98caa3bc469559519d6fa2da7c1790551fe 100644 --- a/SITE/portal.html +++ b/SITE/portal.html @@ -256,7 +256,11 @@ href="http://ifpindia.org/Brahmanical-Culture-in-Ancient-India.html">Brahmanical Sanskrit Studies Centre, Silpakorn University, Bangkok
Samskrita Bharati Organisation
Utkal University Sanskrit Dept
- + + + +Sanskrit Research Institute, Auroville
+

Sanskrit Conferences