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

Addition of several root_aoristp forms (affix ci.n) for Pan{3,1,60-66}

parent 2b6d9750
......@@ -13,8 +13,8 @@
\begin{center}
\vspace*{24pt}
{\Large The Sanskrit Platform Documentation}\\[10pt]
{\Large (Sanskrit Library V3.05; Zen toolkit V3.1)}\\[15pt]
{\large 2018-03-17}\\[15pt]
{\Large (Sanskrit Library V3.06; Zen toolkit V3.1)}\\[15pt]
{\large 2018-05-01}\\[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.05"}~\ocwkw{and}~$\ocwlowerid{version\_date}=$\ocwstring{"2018\symbol{45}03\symbol{45}17"};\ocweol
$\ocwlowerid{value}~\ocwlowerid{version}=$\ocwstring{"3.06"}~\ocwkw{and}~$\ocwlowerid{version\_date}=$\ocwstring{"2018\symbol{45}05\symbol{45}01"};\ocweol
\ocweol
\ocwendcode{}\typeout{OcamlWeb file Date.ml}
\ocwmodule{Date}
......@@ -4796,10 +4796,12 @@ $\ocwlowerid{err}~\ocwlowerid{loc}~\ocwlowerid{str}~])$\ocweol
\ocwendcode{}\typeout{OcamlWeb file Test_stamp.ml}
\ocwmodule{Test\_stamp}
\label{test_stamp.ml:0}%
Tests consistency of data version of \ocwbegindcode{}$\ocwupperid{Heritage\_Resources}$\ocwenddcode{}
with program version of \ocwbegindcode{}$\ocwupperid{Heritage\_Platform}$\ocwenddcode{}
Tests consistency of data version of \ocwbegindcode{}$\ocwupperid{Heritage\_Resources}$\ocwenddcode{}
\ocweol
\label{test_stamp.ml:731}%
\ocwindent{0.00em}
with program version of \ocwbegindcode{}$\ocwupperid{Heritage\_Platform}$\ocwenddcode{}
\ocweol
\label{test_stamp.ml:750}%
\medskip
\ocwbegincode{}\ocwindent{0.00em}
$\ocwlowerid{value}~\ocwlowerid{check\_data\_version}~()~=~$\ocweol
......@@ -4842,7 +4844,7 @@ $(\ocwupperid{Gen.}\ocwlowerid{gobble}~\ocwlowerid{resources\_version\_file}~:~(
\ocwindent{2.50em}
;~$\ocwlowerid{print\_string}~($\ocwstring{"assumes\ocwvspace{}version\ocwvspace{}"}~\^{}~$\ocwupperid{Version.}\ocwlowerid{version})$\ocweol
\ocwindent{2.50em}
;~$\ocwlowerid{print\_string}~$\ocwstring{"of\ocwvspace{}Heritage\_Resources\symbol{92}n"}\ocweol
;~$\ocwlowerid{print\_string}~$\ocwstring{"\ocwvspace{}of\ocwvspace{}Heritage\_Resources\symbol{92}n"}\ocweol
\ocwindent{2.50em}
;~$\ocwlowerid{print\_string}~$\ocwstring{"while\ocwvspace{}the\ocwvspace{}currently\ocwvspace{}installed\ocwvspace{}Heritage\_Resources\ocwvspace{}at\ocwvspace{}"}\ocweol
\ocwindent{2.50em}
......@@ -8488,9 +8490,9 @@ $\ocwlowerid{where}~\ocwlowerid{entern}~(\ocwlowerid{c},\ocwlowerid{w})~=~$\ocwe
\ocwkw{let}~$\ocwlowerid{f}~=~\ocwupperid{Noun\_form}~\ocwlowerid{g}~\ocwlowerid{n}~\ocwlowerid{c}~$\ocwkw{in}~\ocweol
\ocwindent{4.50em}
\ocwkw{if}~$\ocwlowerid{c}=\ocwupperid{Voc}~$\ocwkw{then}~\ocweol
\ocwindent{6.50em}
\ocwindent{6.00em}
\ocwkw{if}~$\ocwlowerid{morpho\_gen.}\ocwlowerid{val}~\land{}~\ocwlowerid{is\_kridanta}~\ocwlowerid{entry}~$\ocwkw{then}~$($\ocwbc{} f is in Kridv \ocwec{}$)~$\ocweol
\ocwindent{6.50em}
\ocwindent{6.00em}
\ocwkw{else}~$\ocwlowerid{add\_voca}~\ocwlowerid{w}~\ocwlowerid{delta}~\ocwlowerid{f}~$\ocwbc{} non-generative Voca \ocwec{}\ocweol
\ocwindent{4.50em}
\ocwkw{else}~\ocwkw{do}~\{~$\ocwlowerid{add\_morph}~\ocwlowerid{w}~\ocwlowerid{delta}~\ocwlowerid{f}~$\ocweol
......@@ -8532,7 +8534,7 @@ $\ocwlowerid{where}~\ocwlowerid{entern}~(\ocwlowerid{p},\ocwlowerid{w})~=~$\ocwk
\ocwindent{3.50em}
\ocwbc{} Now we take care of \Pan{6,1,94} when not blocked by \Pan{6,1,89} \ocwec{}\ocweol
\ocwindent{3.50em}
\ocwbc{} ex: prejate, + (Kazikaa) upelayati prelayati upo.sati pro.sati \ocwec{}\ocweol
\ocwbc{} ex: prejate + (Kazikaa) upelayati prelayati upo.sati pro.sati \ocwec{}\ocweol
\ocwindent{3.50em}
;~\ocwkw{if}~$\ocwlowerid{morpho\_gen.}\ocwlowerid{val}~$\ocwkw{then}~\ocweol
\ocwindent{6.00em}
......@@ -8686,7 +8688,7 @@ $\mid{}~\ocwupperid{Bare}~(\ocwupperid{Krid}~\ocwlowerid{\_}~\ocwlowerid{root})~
\ocwindent{3.50em}
\}\medskip
\label{inflected.ml:21142}%
\label{inflected.ml:21139}%
\ocwindent{1.50em}
$\mid{}~\ocwlowerid{\_}~\rightarrow{}~\ocwlowerid{failwith}~$\ocwstring{"Unexpected\ocwvspace{}arg\ocwvspace{}to\ocwvspace{}enter\_form"}\ocweol
\ocwindent{1.50em}
......@@ -9621,15 +9623,15 @@ $\mid{}~$\ocwstring{"inv"}~$\mid{}~$\ocwstring{"il"}~$\mid{}~$\ocwstring{"i.s\#2
\ocwindent{1.00em}
$\mid{}~$\ocwstring{"und"}~$\mid{}~$\ocwstring{"umbh"}~$\mid{}~$\ocwstring{"u.s"}~$\mid{}~$\ocwstring{".rc\#1"}~$\mid{}~$\ocwstring{".rdh"}~$\mid{}~$\ocwstring{".r.s"}~$\mid{}~$\ocwstring{"ej"}~$\mid{}~$\ocwstring{"kas"}~$\mid{}~$\ocwstring{"kiil"}\ocweol
\ocwindent{1.00em}
$\mid{}~$\ocwstring{"ku.t"}~$\mid{}~$\ocwstring{"ku.n.th"}~$\mid{}~$\ocwstring{"kunth"}~$\mid{}~$\ocwstring{"kup"}~$\mid{}~$\ocwstring{"kul"}~$\mid{}~$\ocwstring{"kuuj"}~$\mid{}~$\ocwstring{"k.rt\#1"}\ocweol
$\mid{}~$\ocwstring{"ku.t"}~$\mid{}~$\ocwstring{"ku.n.th"}~$\mid{}~$\ocwstring{"kunth"}~$\mid{}~$\ocwstring{"kup"}~$\mid{}~$\ocwstring{"kul"}~$\mid{}~$\ocwstring{"kuuj"}~$\mid{}~$\ocwstring{"k.rt\#1"}~$\mid{}~$\ocwstring{"k.rz"}\ocweol
\ocwindent{1.00em}
$\mid{}~$\ocwstring{"k.rz"}~$\mid{}~$\ocwstring{"krand"}~$\mid{}~$\ocwstring{"krii.d"}~$\mid{}~$\ocwstring{"kru\~{}nc\#1"}~$\mid{}~$\ocwstring{"krudh\#1"}~$\mid{}~$\ocwstring{"kruz"}~$\mid{}~$\ocwstring{"klam"}\ocweol
$\mid{}~$\ocwstring{"krand"}~$\mid{}~$\ocwstring{"krii.d"}~$\mid{}~$\ocwstring{"kru\~{}nc\#1"}~$\mid{}~$\ocwstring{"krudh\#1"}~$\mid{}~$\ocwstring{"kruz"}~$\mid{}~$\ocwstring{"klam"}~$\mid{}~$\ocwstring{"klid"}~\ocweol
\ocwindent{1.00em}
$\mid{}~$\ocwstring{"klid"}~$\mid{}~$\ocwstring{"kliz"}~$\mid{}~$\ocwstring{"kvath"}~$\mid{}~$\ocwstring{"k.sar"}~$\mid{}~$\ocwstring{"k.sal"}~$\mid{}~$\ocwstring{"k.si"}~$\mid{}~$\ocwstring{"k.sii"}~$\mid{}~$\ocwstring{"k.su"}\ocweol
$\mid{}~$\ocwstring{"kliz"}~$\mid{}~$\ocwstring{"kvath"}~$\mid{}~$\ocwstring{"k.sar"}~$\mid{}~$\ocwstring{"k.sal"}~$\mid{}~$\ocwstring{"k.si"}~$\mid{}~$\ocwstring{"k.sii"}~$\mid{}~$\ocwstring{"k.su"}~$\mid{}~$\ocwstring{"k.sudh\#1"}\ocweol
\ocwindent{1.00em}
$\mid{}~$\ocwstring{"k.sudh\#1"}~$\mid{}~$\ocwstring{"k.subh"}~$\mid{}~$\ocwstring{"k.svi.d"}~$\mid{}~$\ocwstring{"khaad"}~$\mid{}~$\ocwstring{"khid"}~$\mid{}~$\ocwstring{"khel"}~$\mid{}~$\ocwstring{"khyaa"}\ocweol
$\mid{}~$\ocwstring{"k.subh"}~$\mid{}~$\ocwstring{"k.svi.d"}~$\mid{}~$\ocwstring{"kha\~{}nj\#1"}~$\mid{}~$\ocwstring{"khaad"}~$\mid{}~$\ocwstring{"khid"}~$\mid{}~$\ocwstring{"khel"}~$\mid{}~$\ocwstring{"khyaa"}~\ocweol
\ocwindent{1.00em}
$\mid{}~$\ocwstring{"gaj"}~$\mid{}~$\ocwstring{"gad"}~$\mid{}~$\ocwstring{"garj"}~$\mid{}~$\ocwstring{"gard"}~$\mid{}~$\ocwstring{"gal"}~$\mid{}~$\ocwstring{"gaa\#1"}~$\mid{}~$\ocwstring{"gaa\#2"}~$\mid{}~$\ocwstring{"gu\~{}nj"}\ocweol
$\mid{}~$\ocwstring{"gaj"}~$\mid{}~$\ocwstring{"gad"}~$\mid{}~$\ocwstring{"garj"}~$\mid{}~$\ocwstring{"gard"}~$\mid{}~$\ocwstring{"gal"}~$\mid{}~$\ocwstring{"gaa\#1"}~$\mid{}~$\ocwstring{"gaa\#2"}~$\mid{}~$\ocwstring{"gu\~{}nj"}~\ocweol
\ocwindent{1.00em}
$\mid{}~$\ocwstring{"gu.n.th"}~$\mid{}~$\ocwstring{"gup"}~$\mid{}~$\ocwstring{"gumph"}~$\mid{}~$\ocwstring{"g.rdh"}~$\mid{}~$\ocwstring{"g.rr\#1"}~$\mid{}~$\ocwstring{"g.rr\#2"}~$\mid{}~$\ocwstring{"granth"}\ocweol
\ocwindent{1.00em}
......@@ -9717,7 +9719,11 @@ $\mid{}~$\ocwstring{"maarg"}~\ocwbc{} root rather than nominal verb \ocwec{}\ocw
\ocwindent{0.00em}
\ocwbc{}| \ocwstring{"has"} Atma needed for hasate \ocwec{}\ocweol
\ocwindent{0.00em}
\ocwbc{}| \ocwstring{"zu.s"} Atma for zu.syate WR epic \ocwec{}\ocweol
\ocwindent{0.00em}
\ocwbc{}| \ocwstring{"a\~{}nj"} also Atma afkte | \ocwstring{"naath"} \ocwstring{"praz"} \ocwstring{"sp.rz\#1"} idem \ocwec{}\ocweol
\ocwindent{0.00em}
\ocwbc{}| Doubt: \ocwstring{"bhuu\#1"} could also be Atma bhavate \ocwec{}\ocweol
\ocwindent{3.00em}
$\rightarrow{}~\ocwupperid{Para}~$\ocwbc{} active only \ocwec{}\ocweol
\ocwindent{1.00em}
......@@ -9773,12 +9779,12 @@ $\mid{}~\ocwlowerid{\_}~\rightarrow{}~\ocwupperid{Ubha}~$\ocwbc{} default \ocwec
~$\mid{}~$\ocwstring{"mi"}~$\mid{}~$\ocwstring{"mith"}~$\mid{}~$\ocwstring{"mil"}~$\mid{}~$\ocwstring{"mii"}~$\mid{}~$\ocwstring{"muc\#1"}~$\mid{}~$\ocwstring{"mud\#1"}~$\mid{}~$\ocwstring{"m.r"}~$\mid{}~$\ocwstring{"m.rj"}~
~$\mid{}~$\ocwstring{"m.rdh"}~$\mid{}~$\ocwstring{"m.r.s"}~$\mid{}~$\ocwstring{"yaj\#1"}~$\mid{}~$\ocwstring{"yaac"}~$\mid{}~$\ocwstring{"yu\#1"}~$\mid{}~$\ocwstring{"yuj\#1"}~$\mid{}~$\ocwstring{"rac"}~
~$\mid{}~$\ocwstring{"ra\~{}nj"}~$\mid{}~$\ocwstring{"ram"}~$\mid{}~$\ocwstring{"rah"}~$\mid{}~$\ocwstring{"raaj\#1"}~$\mid{}~$\ocwstring{"ri"}~$\mid{}~$\ocwstring{"ric"}~$\mid{}~$\ocwstring{"rud\#1"}~$\mid{}~$\ocwstring{"rudh\#2"}
~$\mid{}~$\ocwstring{"lafgh"}~$\mid{}~$\ocwstring{"labh"}~$\mid{}~$\ocwstring{"la.s"}~$\mid{}~$\ocwstring{"lip"}~$\mid{}~$\ocwstring{"lih\#1"}~$\mid{}~$\ocwstring{"lup"}~$\mid{}~$\ocwstring{"luu\#1"}~$\mid{}~$\ocwstring{"vad"}~
~$\mid{}~$\ocwstring{"vap\#1"}~$\mid{}~$\ocwstring{"vap\#2"}~$\mid{}~$\ocwstring{"val"}~$\mid{}~$\ocwstring{"vah\#1"}~$\mid{}~$\ocwstring{"vaa\#3"}~$\mid{}~$\ocwstring{"vic"}~$\mid{}~$\ocwstring{"vij"}~$\mid{}~$\ocwstring{"viij"}~
~$\mid{}~$\ocwstring{"v.r\#2"}~$\mid{}~$\ocwstring{"v.rt\#1"}~$\mid{}~$\ocwstring{"vyath"}~$\mid{}~$\ocwstring{"vyaa"}~$\mid{}~$\ocwstring{"zap"}~$\mid{}~$\ocwstring{"zaa"}~$\mid{}~$\ocwstring{"zubh\#1"}~
~$\mid{}~$\ocwstring{"zyaa"}~$\mid{}~$\ocwstring{"zri"}~$\mid{}~$\ocwstring{"san\#1"}~$\mid{}~$\ocwstring{"sah\#1"}~$\mid{}~$\ocwstring{"sic"}~$\mid{}~$\ocwstring{"su\#2"}~$\mid{}~$\ocwstring{"suud"}~$\mid{}~$\ocwstring{"stambh"}~
~$\mid{}~$\ocwstring{"stu"}~$\mid{}~$\ocwstring{"st.rr"}~$\mid{}~$\ocwstring{"sthaa\#1"}~$\mid{}~$\ocwstring{"sp.rz\#1"}~$\mid{}~$\ocwstring{"sp.rh"}~$\mid{}~$\ocwstring{"syand"}~$\mid{}~$\ocwstring{"svad"}~$\mid{}~$\ocwstring{"had"}~
~$\mid{}~$\ocwstring{"hikk"}~$\mid{}~$\ocwstring{"hu"}~$\mid{}~$\ocwstring{"huu"}~$\mid{}~$\ocwstring{"h.r\#1"}~\ocwenddcode{} \ocwec{}\ocweol
~$\mid{}~$\ocwstring{"lafgh"}~$\mid{}~$\ocwstring{"lak.s"}~$\mid{}~$\ocwstring{"labh"}~$\mid{}~$\ocwstring{"la.s"}~$\mid{}~$\ocwstring{"lip"}~$\mid{}~$\ocwstring{"lih\#1"}~$\mid{}~$\ocwstring{"lup"}~$\mid{}~$\ocwstring{"luu\#1"}
~$\mid{}~$\ocwstring{"vad"}~$\mid{}~$\ocwstring{"vap\#1"}~$\mid{}~$\ocwstring{"vap\#2"}~$\mid{}~$\ocwstring{"val"}~$\mid{}~$\ocwstring{"vah\#1"}~$\mid{}~$\ocwstring{"vaa\#3"}~$\mid{}~$\ocwstring{"vic"}~$\mid{}~$\ocwstring{"vij"}~
~$\mid{}~$\ocwstring{"viij"}~$\mid{}~$\ocwstring{"v.r\#2"}~$\mid{}~$\ocwstring{"v.rt\#1"}~$\mid{}~$\ocwstring{"vyath"}~$\mid{}~$\ocwstring{"vyaa"}~$\mid{}~$\ocwstring{"zap"}~$\mid{}~$\ocwstring{"zaa"}~$\mid{}~$\ocwstring{"zu.s"}~
~$\mid{}~$\ocwstring{"zubh\#1"}~$\mid{}~$\ocwstring{"zyaa"}~$\mid{}~$\ocwstring{"zri"}~$\mid{}~$\ocwstring{"san\#1"}~$\mid{}~$\ocwstring{"sah\#1"}~$\mid{}~$\ocwstring{"sic"}~$\mid{}~$\ocwstring{"su\#2"}~$\mid{}~$\ocwstring{"suud"}~
~$\mid{}~$\ocwstring{"stambh"}~$\mid{}~$\ocwstring{"stu"}~$\mid{}~$\ocwstring{"st.rr"}~$\mid{}~$\ocwstring{"sthaa\#1"}~$\mid{}~$\ocwstring{"sp.rz\#1"}~$\mid{}~$\ocwstring{"sp.rh"}~$\mid{}~$\ocwstring{"syand"}
~$\mid{}~$\ocwstring{"svad"}~$\mid{}~$\ocwstring{"had"}~$\mid{}~$\ocwstring{"hikk"}~$\mid{}~$\ocwstring{"hu"}~$\mid{}~$\ocwstring{"huu"}~$\mid{}~$\ocwstring{"h.r\#1"}~\ocwenddcode{} \ocwec{}\ocweol
\ocwindent{1.00em}
\ocwbc{} + corr. \ocwstring{"pa.th"} | \ocwstring{"sthaa\#1"} | \ocwstring{"praz"} | \ocwstring{"k.rr"} | \ocwstring{"p.rc"} | \ocwstring{"bandh"} \ocwec{}\ocweol
\ocwindent{1.00em}
......@@ -9966,7 +9972,7 @@ $]$\ocweol
\ocwendcode{}\ocwindent{0.00em}
Refining with potential preverb
\ocweol
\label{pada.ml:11165}%
\label{pada.ml:11288}%
\medskip
\ocwbegincode{}\ocwindent{0.00em}
$\ocwlowerid{value}~\ocwlowerid{voices\_of\_pv}~\ocwlowerid{upasarga}~\ocwlowerid{gana}~=~$\ocwkw{fun}~\ocwbc{} gana only used for \ocwstring{"tap"} \ocwstring{"i"} \ocwec{}\ocweol
......@@ -22761,11 +22767,9 @@ $]~$\ocwkw{in}~\ocweol
\ocwindent{3.00em}
$(\ocwlowerid{strong}~\ocwlowerid{rstem},\ocwlowerid{wstem})$\ocweol
\ocwindent{3.00em}
\ocwkw{and}~$\ocwlowerid{glue}~=~\ocwlowerid{revaffix}~[\ocwlowerid{rv};~\ocwlowerid{rc}]~$\ocwkw{in}~\ocweol
\ocwkw{and}~$\ocwlowerid{glue}~=~\ocwlowerid{revaffix}~[~\ocwlowerid{rv};~\ocwlowerid{rc}~]~$\ocwkw{in}~\ocweol
\ocwindent{4.00em}
\ocwkw{if}~$\ocwlowerid{entry}=$\ocwstring{"s.r"}~\ocwkw{then}~\ocwbc{} ad-hoc nonsense \ocwec{}\ocweol
\ocwindent{6.50em}
$(\ocwlowerid{revcode}~$\ocwstring{"sisar"},$\ocwlowerid{revcode}~$\ocwstring{"sis.r"},$\ocwlowerid{iiflag})~$\ocwbc{} to avoid si.sarti ?!? \ocwec{}\ocweol
\ocwkw{if}~$\ocwlowerid{entry}=$\ocwstring{"s.r"}~\ocwkw{then}~$(\ocwlowerid{revcode}~$\ocwstring{"sisar"},$\ocwlowerid{revcode}~$\ocwstring{"sis.r"},$\ocwlowerid{iiflag})~$\ocweol
\ocwindent{4.00em}
\ocwkw{else}~$(\ocwlowerid{glue}~\ocwlowerid{strong},\ocwlowerid{glue}~\ocwlowerid{weak},\ocwlowerid{iiflag})$\ocweol
\ocwindent{2.00em}
......@@ -22776,7 +22780,7 @@ $]$\ocweol
\ocwendcode{}\ocwindent{0.00em}
Dhatupatha markers (from AK's listing)
\ocweol
\label{verbs.ml:21437}%
\label{verbs.ml:21436}%
\medskip
\ocwbegincode{}\ocwindent{0.00em}
$\ocwlowerid{value}~\ocwlowerid{aa\_it}~=~$\ocwkw{fun}\ocweol
......@@ -22890,7 +22894,7 @@ In all such functions, \ocwbegindcode{}$(\ocwlowerid{stem}~:~\ocwlowerid{word})$
\ocwindent{0.00em}
Exemple pour cyu: stem=strong=guna=cyo et cyo+ati=cyavati par \ocwbegindcode{}$\ocwlowerid{int\_sandhi}$\ocwenddcode{}
\ocweol
\label{verbs.ml:24262}%
\label{verbs.ml:24261}%
\medskip
\ocwbegincode{}\ocwindent{0.00em}
$\ocwlowerid{value}~\ocwlowerid{compute\_thematic\_presenta}~\ocwlowerid{cl}~\ocwlowerid{conj}~\ocwlowerid{stem}~\ocwlowerid{entry}~\ocwlowerid{third}~=~$\ocweol
......@@ -23348,7 +23352,7 @@ $\ocwlowerid{value}~\ocwlowerid{compute\_causativea}~=~\ocwlowerid{compute\_them
\ocwindent{0.00em}
set indicates connecting vowel string of se.t root
\ocweol
\label{verbs.ml:31408}%
\label{verbs.ml:31407}%
\medskip
\ocwbegincode{}\ocwindent{0.00em}
$\ocwlowerid{value}~\ocwlowerid{fix2}~\ocwlowerid{stem}~\ocwlowerid{suff}~\ocwlowerid{set}~=~$\ocweol
......@@ -24167,7 +24171,7 @@ $]$\ocweol
\ocwendcode{}\ocwindent{0.00em}
** Gana 3 **
\ocweol
\label{verbs.ml:47097}%
\label{verbs.ml:47096}%
\medskip
\ocwbegincode{}\ocwindent{0.00em}
$\ocwlowerid{value}~\ocwlowerid{strip\_ii}~=~$\ocwkw{fun}~\ocweol
......@@ -24739,7 +24743,7 @@ $\ocwlowerid{record\_part\_m\_ath}~(\ocwlowerid{pprm}~3)~\ocwlowerid{short}~\ocw
\ocwendcode{}\ocwindent{0.00em}
** Gana 5 **
\ocweol
\label{verbs.ml:56813}%
\label{verbs.ml:56812}%
\medskip
\ocwbegincode{}\ocwindent{0.00em}
$\ocwlowerid{value}~\ocwlowerid{compute\_athematic\_present5a}~\ocwlowerid{gana}~\ocwlowerid{strong}~\ocwlowerid{weak}~\ocwlowerid{vow}~\ocwlowerid{entry}~\ocwlowerid{third}~=~$\ocweol
......@@ -25219,7 +25223,7 @@ $]$\ocweol
\ocwendcode{}\ocwindent{0.00em}
** Gana 7 **
\ocweol
\label{verbs.ml:65217}%
\label{verbs.ml:65216}%
\medskip
\ocwbegincode{}\ocwindent{0.00em}
$\ocwlowerid{value}~\ocwlowerid{compute\_athematic\_present7a}~\ocwlowerid{strong}~\ocwlowerid{weak}~\ocwlowerid{entry}~\ocwlowerid{third}~=~$\ocweol
......@@ -25551,7 +25555,7 @@ Conjugation of k.r
\ocwindent{2.50em}
"karo" "kuru" "kur"
\ocweol
\label{verbs.ml:70571}%
\label{verbs.ml:70570}%
\medskip
\ocwbegincode{}\ocwindent{0.00em}
$\ocwlowerid{value}~\ocwlowerid{compute\_athematic\_presentk}~\ocwlowerid{strong}~\ocwlowerid{weak}~\ocwlowerid{short}~\ocwlowerid{entry}~\ocwlowerid{third}~=~$\ocweol
......@@ -25797,7 +25801,7 @@ $\ocwlowerid{value}~\ocwlowerid{compute\_presentk}~\ocwlowerid{sstem}~\ocwloweri
\ocwendcode{}\ocwindent{0.00em}
** Gana 9 **
\ocweol
\label{verbs.ml:74150}%
\label{verbs.ml:74149}%
\medskip
\ocwbegincode{}\ocwindent{0.00em}
$\ocwlowerid{value}~\ocwlowerid{compute\_athematic\_present9a}~\ocwlowerid{strong}~\ocwlowerid{weak}~\ocwlowerid{short}~\ocwlowerid{entry}~\ocwlowerid{third}~=~$\ocweol
......@@ -26119,7 +26123,7 @@ $]$\ocweol
\ocwendcode{}\ocwindent{0.00em}
Benedictive/precative. Formed from \ocwbegindcode{}$\ocwlowerid{conjug\_optativea}$\ocwenddcode{}
\ocweol
\label{verbs.ml:79843}%
\label{verbs.ml:79842}%
\medskip
\ocwbegincode{}\ocwindent{0.00em}
$\ocwlowerid{value}~\ocwlowerid{conjug\_benedictivea}~\ocwlowerid{conj}~\ocwlowerid{weak}~\ocwlowerid{entry}~=$\ocweol
......@@ -26215,7 +26219,7 @@ $])~$\ocweol
\ocwendcode{}\ocwindent{0.00em}
Similar to \ocwbegindcode{}$\ocwlowerid{compute\_thematic\_paradigm\_act}$\ocwenddcode{}
\ocweol
\label{verbs.ml:81132}%
\label{verbs.ml:81131}%
\medskip
\ocwbegincode{}\ocwindent{0.00em}
$\ocwlowerid{value}~\ocwlowerid{compute\_futurea}~\ocwlowerid{conj}~\ocwlowerid{stem}~\ocwlowerid{entry}~=~$\ocweol
......@@ -26512,7 +26516,7 @@ $\mid{}~$\ocwstring{"zli.s"}~$\mid{}~$\ocwstring{"sa\~{}nj"}~$\mid{}~$\ocwstring
\ocwindent{6.00em}
$\mid{}~$\ocwstring{"sva\~{}nj"}~$\mid{}~$\ocwstring{"svid\#2"}~$\mid{}~$\ocwstring{"had"}~\ocweol
\ocwindent{8.00em}
$\rightarrow{}~\ocwlowerid{anit}$\ocweol
$\rightarrow{}~\ocwlowerid{anit}~$\ocweol
\ocwindent{6.00em}
$\mid{}~\ocwlowerid{\_}~\rightarrow{}~\ocwlowerid{set}~$\ocwbc{} default all multisyllabic, gana 10, nominal verbs plus:
\ocwbegindcode{}~\ocwstring{"afg"}~$\mid{}~$\ocwstring{"a\~{}nc"}~$\mid{}~$\ocwstring{"an\#2"}~$\mid{}~$\ocwstring{"arh"}~$\mid{}~$\ocwstring{"av"}~$\mid{}~$\ocwstring{"az\#1"}~$\mid{}~$\ocwstring{"az\#2"}~$\mid{}~$\ocwstring{"as\#2"}~$\mid{}~$\ocwstring{"aas\#2"}
......@@ -26792,9 +26796,9 @@ $\mid{}~$\ocwstring{"nud"}~$\mid{}~$\ocwstring{"pad\#1"}~$\mid{}~$\ocwstring{"pi
\ocwindent{2.00em}
$\mid{}~$\ocwstring{"majj"}~$\mid{}~$\ocwstring{"man"}~$\mid{}~$\ocwstring{"mid"}~$\mid{}~$\ocwstring{"mlaa"}~$\mid{}~$\ocwstring{"ri"}~$\mid{}~$\ocwstring{"lii"}~$\mid{}~$\ocwstring{"luu\#1"}~$\mid{}~$\ocwstring{"vij"}~$\mid{}~$\ocwstring{"vid\#2"}\ocweol
\ocwindent{2.00em}
$\mid{}~$\ocwstring{"zad"}~$\mid{}~$\ocwstring{"zuu"}~$\mid{}~$\ocwstring{"z.rr"}~$\mid{}~$\ocwstring{"sad\#1"}~$\mid{}~$\ocwstring{"skand"}~$\mid{}~$\ocwstring{"syand"}~$\mid{}~$\ocwstring{"st.rr"}~$\mid{}~$\ocwstring{"styaa"}~\ocweol
$\mid{}~$\ocwstring{"vlii"}~$\mid{}~$\ocwstring{"zad"}~$\mid{}~$\ocwstring{"zuu"}~$\mid{}~$\ocwstring{"z.rr"}~$\mid{}~$\ocwstring{"sad\#1"}~$\mid{}~$\ocwstring{"skand"}~$\mid{}~$\ocwstring{"syand"}~$\mid{}~$\ocwstring{"st.rr"}~\ocweol
\ocwindent{2.00em}
$\mid{}~$\ocwstring{"had"}~$\mid{}~$\ocwstring{"svid\#2"}~$\mid{}~$\ocwstring{"haa\#2"}~\ocwbc{} but not \ocwstring{"k.svi.d"} \ocwstring{"zrath"} \ocwec{}\ocweol
$\mid{}~$\ocwstring{"styaa"}~$\mid{}~$\ocwstring{"had"}~$\mid{}~$\ocwstring{"svid\#2"}~$\mid{}~$\ocwstring{"haa\#2"}~\ocwbc{} but not \ocwstring{"k.svi.d"} \ocwstring{"zrath"} \ocwec{}\ocweol
\ocwindent{3.00em}
$\rightarrow{}~$\ocweol
\ocwindent{3.00em}
......@@ -27097,7 +27101,7 @@ $]~$\ocweol
\ocwendcode{}\ocwindent{0.00em}
Metathesis -arx -> -rax
\ocweol
\label{verbs.ml:102025}%
\label{verbs.ml:102034}%
\medskip
\ocwbegincode{}\ocwindent{0.00em}
$\ocwlowerid{value}~\ocwlowerid{ar\_ra}~=~$\ocwkw{fun}~\ocweol
......@@ -27335,7 +27339,7 @@ $]$\ocweol
\ocwendcode{}\ocwindent{0.00em}
Passive system
\ocweol
\label{verbs.ml:107380}%
\label{verbs.ml:107389}%
\medskip
\ocwbegincode{}\ocwindent{0.00em}
$\ocwlowerid{value}~\ocwlowerid{admits\_passive}~=~$\ocwkw{fun}~\ocweol
......@@ -27366,7 +27370,7 @@ $]$\ocweol
\ocwendcode{}\ocwindent{0.00em}
Similar to \ocwbegindcode{}$\ocwlowerid{compute\_thematic\_middle}$\ocwenddcode{}
\ocweol
\label{verbs.ml:108059}%
\label{verbs.ml:108068}%
\medskip
\ocwbegincode{}\ocwindent{0.00em}
$\ocwlowerid{value}~\ocwlowerid{compute\_passive\_present}~\ocwlowerid{verbal}~\ocwlowerid{stem}~\ocwlowerid{entry}~=~$\ocweol
......@@ -27614,7 +27618,7 @@ NB b=iopt not sufficient. See Whitney§797
\ocwindent{0.00em}
Warning: baroque code ahead
\ocweol
\label{verbs.ml:111788}%
\label{verbs.ml:111797}%
\medskip
\ocwbegincode{}\ocwindent{0.00em}
$\ocwlowerid{value}~\ocwlowerid{redup\_perf}~\ocwlowerid{root}~=~$\ocweol
......@@ -27703,7 +27707,7 @@ $\mid{}~\ocwlowerid{\_}~\rightarrow{}~\ocwlowerid{revw}$\ocweol
\ocwindent{10.00em}
$]~$\ocwkw{in}~$(\ocwlowerid{strong}~\ocwlowerid{w},~\ocwlowerid{w})$\medskip
\label{verbs.ml:114037}%
\label{verbs.ml:114046}%
\ocwindent{4.50em}
$\mid{}~\ocwlowerid{\_}~$\ocwbc{} aa ii uu \ocwec{}~$\rightarrow{}~(\ocwlowerid{revs},~\ocwlowerid{revw})$\ocweol
\ocwindent{4.50em}
......@@ -28748,7 +28752,7 @@ Aorist system
\ocwindent{0.00em}
augment True for aorist, False for injunctive
\ocweol
\label{verbs.ml:132935}%
\label{verbs.ml:132944}%
\medskip
\ocwbegincode{}\ocwindent{0.00em}
$\ocwlowerid{value}~\ocwlowerid{sigma}~\ocwlowerid{augment}~\ocwlowerid{stem}~\ocwlowerid{suff}~=~$\ocweol
......@@ -29353,6 +29357,8 @@ $\ocwlowerid{enter1}~\ocwlowerid{entry}~(\ocwupperid{Conju}~(\ocwlowerid{injm}~1
\ocwindent{0.00em}
$\ocwlowerid{value}~\ocwlowerid{compute\_root\_aoristp}~\ocwlowerid{stem}~\ocwlowerid{entry}~=~$\ocwbc{} passive aorist Whitney§843 \ocwec{}\ocweol
\ocwindent{1.00em}
\ocwbc{} \Pan{3,1,60-66} suffix ci.n usage réflexif-passif agent/objet karmakart.r \ocwec{}\ocweol
\ocwindent{1.00em}
\ocwbc{} TODO use Kümmel 1996 for Vedic plural 3rd forms \ocwec{}\ocweol
\ocwindent{1.00em}
\ocwkw{let}~$\ocwlowerid{conjug}~\ocwlowerid{person}~\ocwlowerid{suff}~=~(\ocwlowerid{person},\ocwlowerid{fix\_augment}~\ocwlowerid{stem}~\ocwlowerid{suff})~$\ocwkw{in}\ocweol
......@@ -29679,17 +29685,19 @@ $\mid{}~$\ocwstring{"vac"}~$\rightarrow{}~$\ocwkw{do}~\ocwbc{} passive aorist \o
\ocwindent{3.00em}
\}\ocweol
\ocwindent{2.00em}
$\mid{}~$\ocwstring{"d.rz\#1"}~$\mid{}~$\ocwstring{"dvi.s\#1"}~$\mid{}~$\ocwstring{"budh\#1"}~$\mid{}~$\ocwstring{"vid\#1"}$\mid{}~$\ocwstring{"s.rj\#1"}~\ocweol
$\mid{}~$\ocwstring{"p.rr"}~$\rightarrow{}~\ocwlowerid{compute\_root\_aoristp}~(\ocwlowerid{revcode}~$\ocwstring{"puur"}$)~\ocwlowerid{entry}~$\ocweol
\ocwindent{2.00em}
$\mid{}~$\ocwstring{"diip"}~$\mid{}~$\ocwstring{"duh\#1"}~$\mid{}~$\ocwstring{"d.rz\#1"}~$\mid{}~$\ocwstring{"dvi.s\#1"}~$\mid{}~$\ocwstring{"budh\#1"}~$\mid{}~$\ocwstring{"vid\#1"}$\mid{}~$\ocwstring{"s.rj\#1"}~\ocweol
\ocwindent{4.00em}
$\rightarrow{}~\ocwlowerid{compute\_root\_aoristp}~\ocwlowerid{strong}~\ocwlowerid{entry}~$\ocweol
$\rightarrow{}~\ocwlowerid{compute\_root\_aoristp}~\ocwlowerid{strong}~\ocwlowerid{entry}$\ocweol
\ocwindent{2.00em}
$\mid{}~$\ocwstring{"rabh"}~$\rightarrow{}~\ocwlowerid{compute\_root\_aoristp}~(\ocwlowerid{revcode}~$\ocwstring{"rambh"}$)~\ocwlowerid{entry}~$\ocweol
\ocwindent{2.00em}
$\mid{}~$\ocwstring{"jaag.r"}~$\mid{}~$\ocwstring{"t.rr"}~$\mid{}~$\ocwstring{"pac"}~$\mid{}~$\ocwstring{"zru"}~$\mid{}~$\ocwstring{"stu"}~$\mid{}~$\ocwstring{"hu"}\ocweol
$\mid{}~$\ocwstring{"ci"}~$\mid{}~$\ocwstring{"jaag.r"}~$\mid{}~$\ocwstring{"t.rr"}~$\mid{}~$\ocwstring{"pac"}~$\mid{}~$\ocwstring{"pad\#1"}~$\mid{}~$\ocwstring{"zru"}~$\mid{}~$\ocwstring{"stu"}~$\mid{}~$\ocwstring{"hu"}\ocweol
\ocwindent{4.00em}
$\rightarrow{}~\ocwlowerid{compute\_root\_aoristp}~\ocwlowerid{long}~\ocwlowerid{entry}~$\ocweol
$\rightarrow{}~\ocwlowerid{compute\_root\_aoristp}~\ocwlowerid{long}~\ocwlowerid{entry}$\ocweol
\ocwindent{5.50em}
\ocwbc{} NB \ocwstring{"zru"} -> azraavi WR while Whitney§844a azraayi typo \ocwec{}~\ocweol
\ocwbc{} NB \ocwstring{"zru"} -> azraavi WR while Whitney§844a *azraayi typo \ocwec{}~\ocweol
\ocwindent{2.00em}
$\mid{}~\ocwlowerid{\_}~\rightarrow{}~()~$\ocwbc{} \ocwstring{"i"} -> iiyaat hard \ocwec{}\ocweol
\ocwindent{2.00em}
......@@ -29759,11 +29767,13 @@ $\mid{}~$\ocwstring{"zri"}~$\mid{}~$\ocwstring{"zru"}~$\mid{}~$\ocwstring{"stu"}
\ocwindent{3.00em}
\}\ocweol
\ocwindent{2.00em}
$\mid{}~$\ocwstring{"iik.s"}~$\mid{}~$\ocwstring{"klid"}~$\mid{}~$\ocwstring{"gup"}~$\mid{}~$\ocwstring{"cur"}~$\mid{}~$\ocwstring{"m.r"}~$\mid{}~$\ocwstring{"d.rz\#1"}~$\mid{}~$\ocwstring{"dyut\#1"}~$\mid{}~$\ocwstring{"vrazc"}~\ocweol
$\mid{}~$\ocwstring{"iik.s"}~$\mid{}~$\ocwstring{"kamp"}~$\mid{}~$\ocwstring{"klid"}~$\mid{}~$\ocwstring{"gup"}~$\mid{}~$\ocwstring{"cur"}~$\mid{}~$\ocwstring{"m.r"}~$\mid{}~$\ocwstring{"d.rz\#1"}~$\mid{}~$\ocwstring{"dyut\#1"}~\ocweol
\ocwindent{2.00em}
$\mid{}~$\ocwstring{"vrazc"}~$\rightarrow{}~$\ocwbc{} active only \ocwec{}\ocweol
\ocwindent{3.00em}
$\rightarrow{}~$\ocwbc{} active only \ocwec{}\ocweol
\ocwkw{let}~$\ocwlowerid{stem}~=~\ocwlowerid{redup\_aor}~\ocwlowerid{weak}~\ocwlowerid{entry}~$\ocwkw{in}~\ocweol
\ocwindent{3.00em}
\ocwkw{let}~$\ocwlowerid{stem}~=~\ocwlowerid{redup\_aor}~\ocwlowerid{weak}~\ocwlowerid{entry}~$\ocwkw{in}~$\ocwlowerid{compute\_redup\_aorista}~\ocwlowerid{stem}~\ocwlowerid{entry}$\ocweol
$\ocwlowerid{compute\_redup\_aorista}~\ocwlowerid{stem}~\ocwlowerid{entry}$\ocweol
\ocwindent{2.00em}
$\mid{}~$\ocwstring{"grah"}~$\rightarrow{}~$\ocwkw{do}~\ocweol
\ocwindent{3.00em}
......@@ -29887,7 +29897,7 @@ $[~$\ocwstring{"ak.s"}~$\mid{}~$\ocwstring{"aj"}~$\mid{}~$\ocwstring{"aas\#2"}~$
\ocwindent{2.00em}
$\mid{}~$\ocwstring{"uuh"}~$\mid{}~$\ocwstring{".rc\#1"}~$\mid{}~$\ocwstring{"k.rt\#1"}~$\mid{}~$\ocwstring{"krand"}~$\mid{}~$\ocwstring{"kram"}~$\mid{}~$\ocwstring{"khan"}~$\mid{}~$\ocwstring{"car"}~\ocweol
\ocwindent{2.00em}
$\mid{}~$\ocwstring{"ce.s.t"}~$\mid{}~$\ocwstring{"jalp"}~$\mid{}~$\ocwstring{"jaag.r"}~$\mid{}~$\ocwstring{"t.rr"}~$\mid{}~$\ocwstring{"pa.th"}~$\mid{}~$\ocwstring{"puu\#1"}~$\mid{}~$\ocwstring{"p.rc"}~\ocweol
$\mid{}~$\ocwstring{"ce.s.t"}~$\mid{}~$\ocwstring{"jalp"}~$\mid{}~$\ocwstring{"jaag.r"}~$\mid{}~$\ocwstring{"t.rr"}~$\mid{}~$\ocwstring{"diip"}~$\mid{}~$\ocwstring{"pa.th"}~$\mid{}~$\ocwstring{"puu\#1"}~$\mid{}~$\ocwstring{"p.rc"}\ocweol
\ocwindent{2.00em}
$\mid{}~$\ocwstring{"baadh"}~$\mid{}~$\ocwstring{"budh\#1"}~$\mid{}~$\ocwstring{"mad\#1"}~$\mid{}~$\ocwstring{"mud\#1"}~$\mid{}~$\ocwstring{"muurch"}~$\mid{}~$\ocwstring{"mlecch"}~$\mid{}~$\ocwstring{"yaac"}~\ocweol
\ocwindent{2.00em}
......@@ -29943,7 +29953,7 @@ $\mid{}~$\ocwstring{"kan"}~$\mid{}~$\ocwstring{"k.r\#2"}$\mid{}~$\ocwstring{"p.r
\ocwindent{3.00em}
$\ocwlowerid{compute\_ath\_is\_aorista}~\ocwlowerid{long}~\ocwlowerid{entry}~$\ocweol
\ocwindent{2.00em}
$\mid{}~$\ocwstring{"jan"}~$\mid{}~$\ocwstring{"zii\#1"}~$\mid{}~$\ocwstring{"spand"}~$\rightarrow{}~$\ocwbc{} middle only \ocwec{}\ocweol
$\mid{}~$\ocwstring{"kamp"}~$\mid{}~$\ocwstring{"jan"}~$\mid{}~$\ocwstring{"zii\#1"}~$\mid{}~$\ocwstring{"spand"}~$\rightarrow{}~$\ocwbc{} middle only \ocwec{}\ocweol
\ocwindent{3.00em}
$\ocwlowerid{compute\_ath\_is\_aoristm}~\ocwlowerid{strong}~\ocwlowerid{entry}~$\ocweol
\ocwindent{2.00em}
......@@ -30061,7 +30071,7 @@ $[~$\ocwstring{"gam"}~$\mid{}~$\ocwstring{"g.rdh"}~$\mid{}~$\ocwstring{"zuc\#1"}
\ocwindent{2.00em}
$\mid{}~$\ocwstring{"vac"}~$\rightarrow{}~\ocwlowerid{compute\_thematic\_injuncta}~(\ocwlowerid{revcode}~$\ocwstring{"voc"}$)~\ocwlowerid{entry}~$\ocwbc{} vocat \ocwec{}\medskip
\label{verbs.ml:157921}%
\label{verbs.ml:158140}%
\ocwindent{2.00em}
$\mid{}~\ocwlowerid{\_}~\rightarrow{}~()~$\ocweol
\ocwindent{2.00em}
......@@ -30247,7 +30257,7 @@ $]~$\ocweol
\ocwendcode{}\ocwindent{0.00em}
Periphrastic future, Infinitive, Passive future participle in -tavya
\ocweol
\label{verbs.ml:161441}%
\label{verbs.ml:161660}%
\medskip
\ocwbegincode{}\ocwindent{0.00em}
$\ocwlowerid{value}~\ocwlowerid{compute\_peri\_fut}~\ocwlowerid{conj}~\ocwlowerid{perstem}~\ocwlowerid{entry}~=~$\ocweol
......@@ -30342,6 +30352,8 @@ $\mid{}~$\ocwstring{"sva\~{}nj"}~$\rightarrow{}~\ocwlowerid{revcode}~$\ocwstring
\ocwindent{6.50em}
$\mid{}~$\ocwstring{"sa\~{}nj"}~$\rightarrow{}~\ocwlowerid{revcode}~$\ocwstring{"saj"}~\ocwbc{} saktum \ocwec{}\ocweol
\ocwindent{6.50em}
$\mid{}~$\ocwstring{".dii"}~$\rightarrow{}~\ocwlowerid{revcode}~$\ocwstring{".dii"}~\ocwbc{} .diitum \ocwec{}\ocweol
\ocwindent{6.50em}
$\mid{}~\ocwlowerid{\_}~\rightarrow{}~\ocwlowerid{perstem}$\ocweol
\ocwindent{6.50em}
$]~$\ocweol
......@@ -30373,7 +30385,7 @@ $\ocwlowerid{iter}~($\ocwkw{fun}~$\ocwlowerid{st}~\rightarrow{}~\ocwlowerid{peri
\ocwendcode{}\ocwindent{0.00em}
Passive future participle in -ya and -aniiya in all conjugations
\ocweol
\label{verbs.ml:164079}%
\label{verbs.ml:164354}%
\medskip
\ocwbegincode{}\ocwindent{0.00em}
$\ocwlowerid{value}~\ocwlowerid{palatal\_exception}~\ocwlowerid{root}~=~\ocwupperid{List.}\ocwlowerid{mem}~\ocwlowerid{root}$\ocweol
......@@ -30636,7 +30648,7 @@ $\ocwlowerid{value}~\ocwlowerid{record\_pfp\_10}~\ocwlowerid{entry}~\ocwlowerid{
\ocwendcode{}\ocwindent{0.00em}
Absolutive and Past Participle
\ocweol
\label{verbs.ml:169810}%
\label{verbs.ml:170085}%
\medskip
\ocwbegincode{}\ocwindent{0.00em}
$\ocwlowerid{value}~\ocwlowerid{record\_part\_ppp}~\ocwlowerid{ppstem}~\ocwlowerid{entry}~=~$\ocwkw{do}~\ocweol
......@@ -31101,7 +31113,7 @@ $\ocwlowerid{record\_absolutive}~\ocwupperid{Desiderative}~\ocwlowerid{abs\_stem
\ocwendcode{}\ocwindent{0.00em}
Intensive or frequentative
\ocweol
\label{verbs.ml:179910}%
\label{verbs.ml:180185}%
\medskip
\ocwbegincode{}\ocwindent{0.00em}
$\ocwlowerid{value}~\ocwlowerid{compute\_intensive\_presenta}~\ocwlowerid{strong}~\ocwlowerid{weak}~\ocwlowerid{iiflag}~\ocwlowerid{entry}~=$\ocweol
......@@ -31284,7 +31296,7 @@ rather than a table. \ocwec{}\medskip
\ocwendcode{}\ocwindent{0.00em}
Similar to \ocwbegindcode{}$\ocwlowerid{compute\_active\_present3}$\ocwenddcode{} with Intensive, plus optional ii forms
\ocweol
\label{verbs.ml:183110}%
\label{verbs.ml:183385}%
\medskip
\ocwbegincode{}\ocwindent{0.00em}
$\ocwlowerid{value}~\ocwlowerid{compute\_intensivea}~\ocwlowerid{wstem}~\ocwlowerid{sstem}~\ocwlowerid{entry}~\ocwlowerid{third}~=~$\ocweol
......@@ -31323,7 +31335,7 @@ $\ocwlowerid{compute\_athematic\_present3m}~\ocwupperid{Intensive}~\ocwlowerid{i
\ocwendcode{}\ocwindent{0.00em}
Present system
\ocweol
\label{verbs.ml:183987}%
\label{verbs.ml:184262}%
\medskip
\ocwbegincode{}\ocwindent{0.00em}
$\ocwlowerid{value}~\ocwlowerid{compute\_present\_system}~\ocwlowerid{entry}~\ocwlowerid{rstem}~\ocwlowerid{gana}~\ocwlowerid{pada}~\ocwlowerid{third}~=~$\ocweol
......@@ -31920,7 +31932,7 @@ Passive system
NB. For gana 4 verbs passive differs from middle mostly by accent
but distinction necessary since different regime
\ocweol
\label{verbs.ml:198941}%
\label{verbs.ml:199216}%
\medskip
\ocwbegincode{}\ocwindent{0.00em}
$\ocwlowerid{value}~\ocwlowerid{compute\_passive\_primary}~\ocwlowerid{entry}~\ocwlowerid{ps\_stem}~=~$\ocweol
......@@ -32096,7 +32108,7 @@ BEWARE. the entry forms given in the next two functions must be in normalized
form - no non-genuine anusvaara
This should be replaced by the recording of the 3rd sg form, like others.
\ocweol
\label{verbs.ml:203792}%
\label{verbs.ml:204067}%
\medskip
\ocwbegincode{}\ocwindent{0.00em}
$\ocwlowerid{value}~\ocwlowerid{den\_stem\_a}~\ocwlowerid{entry}~=~$\ocwbc{} in general transitive Whitney§1059c \ocwec{}\ocweol
......@@ -37052,6 +37064,8 @@ $[~$\ocwstring{".rc"}\ocweol
\ocwindent{2.00em}
$\mid{}~$\ocwstring{"krudh"}\ocweol
\ocwindent{2.00em}
$\mid{}~$\ocwstring{"kha\~{}nj"}~\ocweol
\ocwindent{2.00em}
$\mid{}~$\ocwstring{"cit"}~\ocweol
\ocwindent{2.00em}
$\mid{}~$\ocwstring{"chad"}~\ocweol
......@@ -37256,12 +37270,16 @@ $\mid{}~$\ocwstring{"dhii"}~\ocweol
\ocwindent{2.00em}
$\mid{}~$\ocwstring{"naz"}~\ocweol
\ocwindent{2.00em}
$\mid{}~$\ocwstring{"pad"}\ocweol
\ocwindent{2.00em}
$\mid{}~$\ocwstring{"pu.s"}\ocweol
\ocwindent{2.00em}
$\mid{}~$\ocwstring{"budh"}\ocweol
\ocwindent{2.00em}
$\mid{}~$\ocwstring{"mad"}~\ocweol
\ocwindent{2.00em}
$\mid{}~$\ocwstring{"yudh"}\ocweol
\ocwindent{2.00em}
$\mid{}~$\ocwstring{"zam"}~\ocweol
\ocwindent{2.00em}
$\mid{}~$\ocwstring{"saa"}\ocweol
......@@ -40226,7 +40244,11 @@ $\mid{}~[~(\ocwupperid{Lopa},\ocwlowerid{rev\_lopa\_form},\ocwlowerid{s})~::~[~(
\ocwindent{3.00em}
\ocwkw{let}~$\ocwlowerid{root\_form}~=~$\ocwkw{match}~$\ocwlowerid{lopa\_form}~$\ocwkw{with}~\ocweol
\ocwindent{11.00em}
$[~[~-2~::~\ocwlowerid{rf}~]~\rightarrow{}~\ocwlowerid{rf}~\mid{}~\ocwlowerid{\_}~\rightarrow{}~\ocwlowerid{failwith}~$\ocwstring{"Wrong\ocwvspace{}lopa\ocwvspace{}form"}~$]~$\ocwkw{in}\ocweol
$[~[~-2~::~\ocwlowerid{rf}~]~\rightarrow{}~\ocwlowerid{rf}~$\ocweol
\ocwindent{11.00em}
$\mid{}~\ocwlowerid{\_}~\rightarrow{}~\ocwlowerid{failwith}~$\ocwstring{"Wrong\ocwvspace{}lopa\ocwvspace{}form"}~\ocweol
\ocwindent{11.00em}
$]~$\ocwkw{in}\ocweol
\ocwindent{3.00em}
\ocwkw{if}~$\ocwlowerid{validate\_pv}~\ocwlowerid{pv\_str}~\ocwlowerid{root\_form}~$\ocwkw{then}\ocweol
\ocwindent{4.00em}
......@@ -40242,10 +40264,8 @@ $\mid{}~[~(\ocwupperid{Lopa},\ocwlowerid{rev\_lopa\_form},\ocwlowerid{\_})~::~\o
\ocwindent{3.00em}
\ocwkw{let}~$\ocwlowerid{lopa\_form}~=~\ocwupperid{Word.}\ocwlowerid{mirror}~\ocwlowerid{rev\_lopa\_form}~$\ocwkw{in}~\ocweol
\ocwindent{3.00em}
\ocwkw{if}~$\ocwlowerid{autonomous\_form}~\ocwlowerid{lopa\_form}$\ocweol
\ocwindent{3.00em}
$\land{}~\ocwlowerid{sa\_before\_check}~\ocwlowerid{lopa\_form}~\ocwlowerid{next}$\ocweol
\ocwindent{3.00em}
\ocwkw{if}~$\ocwlowerid{autonomous\_form}~\ocwlowerid{lopa\_form}~\land{}~\ocwlowerid{sa\_before\_check}~\ocwlowerid{lopa\_form}~\ocwlowerid{next}$\ocweol
\ocwindent{4.50em}
\ocwkw{then}~$\ocwlowerid{out}~$\ocwkw{else}~$[\,]$\ocweol
\ocwindent{1.00em}
$\mid{}~$\ocwbc{} infinitives in -tu with preverbs \ocwec{}\ocweol
......@@ -40657,7 +40677,7 @@ $]$\ocweol
\ocwindent{0.00em}
;\medskip
\label{dispatcher.ml:30735}%
\label{dispatcher.ml:30778}%
\ocwindent{0.00em}
\ocwkw{end};\ocweol
\ocweol
......@@ -760,6 +760,7 @@ value resolve_homonym entry =
| "druh"
| "dhii"
| "naz"
| "pad"
| "pu.s"
| "budh"
| "mad"
......
......@@ -7,8 +7,8 @@
(* ©2018 Institut National de Recherche en Informatique et en Automatique *)
(**************************************************************************)
(* Tests consistency of data version of [Heritage_Resources]
with program version of [Heritage_Platform] *)
(* Tests consistency of data version of [Heritage_Resources] *)
(* with program version of [Heritage_Platform] *)
value check_data_version () =
let resources_version_file = Paths.skt_resources_dir ^ "DATA/version.rem" in
......
......@@ -3834,6 +3834,7 @@ value compute_root_injunctm stem entry = (* rare *)
enter1 entry (Conju (injm 1) (conjugs_past_m conjug))
;
value compute_root_aoristp stem entry = (* passive aorist Whitney§843 *)
(* \Pan{3,1,60-66} suffix ci.n usage réflexif-passif agent/objet karmakart.r *)
(* TODO use Kümmel 1996 for Vedic plural 3rd forms *)
let conjug person suff = (person,fix_augment stem suff) in
let conju3 = Conju aorp1 [ (Singular,[ conjug Third "i" ]) ] in
......@@ -3999,12 +4000,13 @@ value compute_aorist entry =
{ compute_root_aoristp long entry
; compute_root_aoristp (revcode "voc") entry
}
| "d.rz#1" | "dvi.s#1" | "budh#1" | "vid#1"| "s.rj#1"
-> compute_root_aoristp strong entry
| "p.rr" -> compute_root_aoristp (revcode "puur") entry
| "diip" | "duh#1" | "d.rz#1" | "dvi.s#1" | "budh#1" | "vid#1"| "s.rj#1"
-> compute_root_aoristp strong entry
| "rabh" -> compute_root_aoristp (revcode "rambh") entry
| "jaag.r" | "t.rr" | "pac" | "zru" | "stu" | "hu"
-> compute_root_aoristp long entry
(* NB "zru" -> azraavi WR while Whitney§844a azraayi typo *)
| "ci" | "jaag.r" | "t.rr" | "pac" | "pad#1" | "zru" | "stu" | "hu"
-> compute_root_aoristp long entry
(* NB "zru" -> azraavi WR while Whitney§844a *azraayi typo *)
| _ -> () (* "i" -> iiyaat hard *)
]
; match entry with (* 2. thematic aorist af *)
......@@ -4104,7 +4106,7 @@ value compute_aorist entry =
; match entry with (* 5. i.s aorist se.t-sic *)
[ "ak.s" | "aj" | "aas#2" | "i.s#1" | "iik.s" | "uk.s" | "uc" | "u.s"
| "uuh" | ".rc#1" | "k.rt#1" | "krand" | "kram" | "khan" | "car"
| "ce.s.t" | "jalp" | "jaag.r" | "t.rr" | "pa.th" | "puu#1" | "p.rc"
| "ce.s.t" | "jalp" | "jaag.r" | "t.rr" | "diip" | "pa.th" | "puu#1" | "p.rc"
| "baadh" | "budh#1" | "mad#1" | "mud#1" | "muurch" | "mlecch" | "yaac"
| "ruc#1" | "lu~nc" | "luu#1" | "vad" | "vadh" | "vid#1" | "v.r#1" | "vraj"
| "z.rr" | "sidh#2" | "skhal" | "stan" | "stu" | "hi.ms" -> do
......
......@@ -8,4 +8,4 @@
(**************************************************************************)
(* Generated by make version - see main Makefile *)
value version="3.06" and version_date="2018-04-18";
value version="3.06" and version_date="2018-05-01";
VERSION='3.06'
DATE='2018-04-18'
DATE='2018-05-01'
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