Commit a7ebec8c authored by Gérard Huet's avatar Gérard Huet

Fix j~napta ppca j~naa#1 Pan{7,2,27}

parent 792b7513
......@@ -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
......@@ -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
......
......@@ -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,6 +5846,7 @@ value fake_compute_conjugs (gana : int) (entry : string) = do
| "gup" -> record_part_ppp (revcode "gupta") entry
| "car" -> compute_extra_car ()
| "cud" -> compute_extra_cud ()
| "j~naa#1"-> compute_extra_jnaa ()
| "dhaa#1" -> compute_extra_dhaa ()
| "nind" -> compute_extra_nind ()
| "p.rr" -> compute_extra_prr ()
......
......@@ -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";
VERSION='3.07'
DATE='2018-05-21'
DATE='2018-05-26'
......@@ -256,7 +256,11 @@ href="http://ifpindia.org/Brahmanical-Culture-in-Ancient-India.html">Brahmanical
<a href="http://www.sanskrit-silpakorn.org/index.php">Sanskrit Studies Centre, Silpakorn University, Bangkok</a><br>
<a href="http://www.samskrita-bharati.org/">Samskrita Bharati Organisation</a><br>
<a href="http://www.utkal-university.org/deptt/sanskrit.htm">Utkal University Sanskrit Dept</a><br>
<!-- obsolete <a href="http://www.amritapuri.org/education/sanskrit/index.htm">Amritapuri University</a><br> -->
<!-- obsolete <a -->
<!-- href="http://www.amritapuri.org/education/sanskrit/index.htm">Amritapuri -->
<!-- University</a><br> -->
<a href="https://sri.auroville.org">Sanskrit Research Institute, Auroville</a><br>
<h2 class="b2"> Sanskrit Conferences </h2>
......
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