Commit 34183ebe authored by Gérard Huet's avatar Gérard Huet

New root zraa

parent 96b32960
......@@ -13,8 +13,8 @@
\begin{center}
\vspace*{24pt}
{\Large The Sanskrit Platform Documentation}\\[10pt]
{\Large (Sanskrit Library V3.15; Zen toolkit V3.1)}\\[15pt]
{\large 2019-04-24}\\[15pt]
{\Large (Sanskrit Library V3.16; Zen toolkit V3.1)}\\[15pt]
{\large 2019-05-09}\\[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.15"}~\ocwkw{and}~$\ocwlowerid{version\_date}=$\ocwstring{"2019\symbol{45}04\symbol{45}24"};\ocweol
$\ocwlowerid{value}~\ocwlowerid{version}=$\ocwstring{"3.16"}~\ocwkw{and}~$\ocwlowerid{version\_date}=$\ocwstring{"2019\symbol{45}05\symbol{45}09"};\ocweol
\ocweol
\ocwendcode{}\typeout{OcamlWeb file Date.ml}
\ocwmodule{Date}
......@@ -7306,7 +7306,8 @@ tests
\ocwendcode{}\ocwindent{0.00em}
Not fully correct - still to be improved
Special cases - to be accommodated at proper point in the derivation Macdonell §60 footnote 1 p 26
Special cases - to be accommodated at proper point in the derivation
cf. Macdonell §60 footnote 1 p 26
d is assimilated before primary suffix -na: ad+na -> anna
t and d are assimilated before secondary suffixes -mat and -maya: vidyunmat m.rnmaya
\ocweol
......@@ -9957,9 +9958,9 @@ $\mid{}~$\ocwstring{"dhv.r"}~$\mid{}~$\ocwstring{"na.t"}~$\mid{}~$\ocwstring{"na
\ocwindent{1.00em}
$\mid{}~$\ocwstring{"nu\#1"}~$\mid{}~$\ocwstring{"n.rt"}~$\mid{}~$\ocwstring{"pa.t"}~$\mid{}~$\ocwstring{"pat\#1"}~$\mid{}~$\ocwstring{"path"}~$\mid{}~$\ocwstring{"paa\#1"}~$\mid{}~$\ocwstring{"paa\#2"}~$\mid{}~$\ocwstring{"pi\#2"}~\ocweol
\ocwindent{1.00em}
$\mid{}~$\ocwstring{"piz\#1"}~$\mid{}~$\ocwstring{"pi.s"}~$\mid{}~$\ocwstring{"pu.t"}~$\mid{}~$\ocwstring{"p.r\#1"}~$\mid{}~$\ocwstring{"p.r.s"}~$\mid{}~$\ocwstring{"p.rr"}~$\mid{}~$\ocwstring{"praa\#1"}~$\mid{}~$\ocwstring{"phal"}~\ocweol
$\mid{}~$\ocwstring{"piz\#1"}~$\mid{}~$\ocwstring{"pi.s"}~$\mid{}~$\ocwstring{"pu.t"}~$\mid{}~$\ocwstring{"p.r\#1"}~$\mid{}~$\ocwstring{"p.r.s"}~$\mid{}~$\ocwstring{"p.rr"}~$\mid{}~$\ocwstring{"praa\#1"}~\ocweol
\ocwindent{1.00em}
$\mid{}~$\ocwstring{"bal"}~$\mid{}~$\ocwstring{"b.rh\#1"}~$\mid{}~$\ocwstring{"b.rh\#2"}~$\mid{}~$\ocwstring{"bha\~{}nj"}~$\mid{}~$\ocwstring{"bha.n"}~$\mid{}~$\ocwstring{"bha.s"}~\ocweol
$\mid{}~$\ocwstring{"phal"}~$\mid{}~$\ocwstring{"bal"}~$\mid{}~$\ocwstring{"b.rh\#1"}~$\mid{}~$\ocwstring{"b.rh\#2"}~$\mid{}~$\ocwstring{"bha\~{}nj"}~$\mid{}~$\ocwstring{"bha.n"}~$\mid{}~$\ocwstring{"bha.s"}~\ocweol
\ocwindent{1.00em}
$\mid{}~$\ocwstring{"bhas"}~$\mid{}~$\ocwstring{"bhaa\#1"}~$\mid{}~$\ocwstring{"bhii\#1"}~$\mid{}~$\ocwstring{"bhuj\#1"}~$\mid{}~$\ocwstring{"bhuu\#1"}~$\mid{}~$\ocwstring{"bhuu.s"}~$\mid{}~$\ocwstring{"bhram"}~\ocweol
\ocwindent{1.00em}
......@@ -9985,7 +9986,7 @@ $\mid{}~$\ocwstring{"za.ms"}~$\mid{}~$\ocwstring{"zak"}~$\mid{}~$\ocwstring{"zam
\ocwindent{1.00em}
$\mid{}~$\ocwstring{"zi.s"}~$\mid{}~$\ocwstring{"ziil"}~$\mid{}~$\ocwstring{"zuc\#1"}~$\mid{}~$\ocwstring{"zudh"}~$\mid{}~$\ocwstring{"zumbh"}~$\mid{}~$\ocwstring{"zu.s"}~$\mid{}~$\ocwstring{"zuu"}~$\mid{}~$\ocwstring{"z.rr"}\ocweol
\ocwindent{1.00em}
$\mid{}~$\ocwstring{"zcut\#1"}~$\mid{}~$\ocwstring{"zram"}~$\mid{}~$\ocwstring{"zru"}~$\mid{}~$\ocwstring{"zli.s"}~$\mid{}~$\ocwstring{"zvas\#1"}~$\mid{}~$\ocwstring{".s.thiiv"}~$\mid{}~$\ocwstring{"sa\~{}nj"}\ocweol
$\mid{}~$\ocwstring{"zcut\#1"}~$\mid{}~$\ocwstring{"zraa"}~$\mid{}~$\ocwstring{"zru"}~$\mid{}~$\ocwstring{"zli.s"}~$\mid{}~$\ocwstring{"zvas\#1"}~$\mid{}~$\ocwstring{".s.thiiv"}~$\mid{}~$\ocwstring{"sa\~{}nj"}\ocweol
\ocwindent{1.00em}
$\mid{}~$\ocwstring{"sad\#1"}~$\mid{}~$\ocwstring{"sap\#1"}~$\mid{}~$\ocwstring{"saa\#1"}~$\mid{}~$\ocwstring{"sidh\#1"}~$\mid{}~$\ocwstring{"sidh\#2"}~$\mid{}~$\ocwstring{"siiv"}~$\mid{}~$\ocwstring{"sur"}~$\mid{}~$\ocwstring{"s.r"}\ocweol
\ocwindent{1.00em}
......@@ -10017,6 +10018,8 @@ $\mid{}~$\ocwstring{"maarg"}~\ocwbc{} root rather than nominal verb \ocwec{}\ocw
\ocwindent{0.00em}
\ocwbc{}| \ocwstring{"cit\#1"} Atma needed for pft. cikite \ocwec{}\ocweol
\ocwindent{0.00em}
\ocwbc{}| \ocwstring{"zram"} Atma needed for vizramate \ocwec{}\ocweol
\ocwindent{0.00em}
\ocwbc{}| \ocwstring{"kaafk.s"} | \ocwstring{"han\#1"} occur also in Atma in BhG: kaafk.se hani.sye \ocwec{}\ocweol
\ocwindent{0.00em}
\ocwbc{}| \ocwstring{"has"} Atma needed for hasate \ocwec{}\ocweol
......@@ -10086,9 +10089,9 @@ $\mid{}~\ocwlowerid{\_}~\rightarrow{}~\ocwupperid{Ubha}~$\ocwbc{} default \ocwec
~$\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{"smi"}~
~$\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{"zubh\#1"}~$\mid{}~$\ocwstring{"zyaa"}~$\mid{}~$\ocwstring{"zram"}~$\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{"smi"}~$\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}
......@@ -10283,7 +10286,7 @@ $]$\ocweol
\ocwendcode{}\ocwindent{0.00em}
Refining with potential preverb
\ocweol
\label{pada.ml:11781}%
\label{pada.ml:11832}%
\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"} \ocwstring{".r"} \ocwec{}\ocweol
......@@ -10380,6 +10383,8 @@ $]$\ocweol
\ocwindent{0.00em}
$\mid{}~$\ocwstring{"zii\#1"}~$\rightarrow{}~$\ocwkw{if}~$\ocwlowerid{upasarga}~=~$\ocwstring{"sam"}~\ocwkw{then}~$\ocwupperid{Ubha}~$\ocwkw{else}~$\ocwupperid{Atma}$\ocweol
\ocwindent{0.00em}
$\mid{}~$\ocwstring{"zram"}~$\rightarrow{}~$\ocwkw{if}~$\ocwlowerid{upasarga}~=~$\ocwstring{"vi"}~\ocwkw{then}~$\ocwupperid{Ubha}~$\ocwbc{} epic vizramate \ocwec{}~\ocwkw{else}~$\ocwupperid{Para}$\ocweol
\ocwindent{0.00em}
$\mid{}~$\ocwstring{"krii"}~$\rightarrow{}~$\ocwkw{match}~$\ocwlowerid{upasarga}~$\ocwkw{with}\ocweol
\ocwindent{6.00em}
$[~$\ocwstring{"vi"}~$\mid{}~$\ocwstring{"pari"}~$\mid{}~$\ocwstring{"ava"}~$\rightarrow{}~\ocwupperid{Atma}~$\ocweol
......@@ -10394,9 +10399,9 @@ $\mid{}~$\ocwstring{"ta\~{}nc"}~$\mid{}~$\ocwstring{"saa\#1"}~$\mid{}~$\ocwstrin
\ocwindent{1.50em}
\ocwkw{match}~$\ocwlowerid{upasarga}~$\ocwkw{with}~\ocweol
\ocwindent{1.50em}
$[~$\ocwstring{""}~$\rightarrow{}~\ocwlowerid{raise}~\ocwupperid{Unattested}$\ocweol
$[~$\ocwstring{""}~$\rightarrow{}~\ocwlowerid{raise}~\ocwupperid{Unattested}~$\ocwbc{} thus braa.hmasya \ocwstring{"Ô\ocwvspace{}Brahmane,\ocwvspace{}tue"} unrecognized \ocwec{}\ocweol
\ocwindent{1.50em}
$\mid{}~\ocwlowerid{\_}~\rightarrow{}~\ocwupperid{Para}$\ocweol
$\mid{}~\ocwlowerid{\_}~\rightarrow{}~\ocwupperid{Para}~$\ocweol
\ocwindent{1.50em}
$]~$\ocweol
\ocwindent{0.00em}
......@@ -14095,7 +14100,7 @@ $]$\ocweol
\ocwindent{0.00em}
$\ocwlowerid{value}~\ocwlowerid{build\_pums}~\ocwlowerid{pum}~\ocwlowerid{pums}~\ocwlowerid{entry}~=~$\ocwbc{} for pu.ms et napu.ms \ocwec{}\ocweol
\ocwindent{0.00em}
\ocwbc{} hi.ms pu.ms no retroflexion of s - Whitney§183a \ocwec{}\ocweol
\ocwbc{} hi.ms pu.ms no retroflexion of s - Whitney§183a Kale §113 \ocwec{}\ocweol
\ocwindent{1.00em}
\ocwkw{let}~$\ocwlowerid{decline}~\ocwlowerid{case}~\ocwlowerid{suff}~=~(\ocwlowerid{case},\ocwupperid{List2.}\ocwlowerid{unstack}~\ocwlowerid{pum}~(\ocwlowerid{code}~\ocwlowerid{suff}))~$\ocweol
\ocwindent{1.00em}
......@@ -16449,7 +16454,7 @@ $]~@~($\ocwkw{if}~$\ocwlowerid{entry}~=~$\ocwstring{"vi.mzati"}\ocweol
\ocwindent{4.00em}
\ocwkw{else}~$[\,]))$\medskip
\label{nouns.ml:85211}%
\label{nouns.ml:85222}%
\ocwindent{0.00em}
;\ocweol
\ocwindent{0.00em}
......@@ -18707,7 +18712,7 @@ $]~]$\ocweol
\ocwendcode{}\ocwindent{0.00em}
Pronouns
\ocweol
\label{nouns.ml:117139}%
\label{nouns.ml:117150}%
\medskip
\ocwbegincode{}\ocwindent{0.00em}
$\ocwlowerid{value}~\ocwlowerid{build\_sa\_tad}~\ocwlowerid{g}~\ocwlowerid{stem}~\ocwlowerid{entry}~=~$\ocweol
......@@ -19803,7 +19808,7 @@ $]$\ocweol
\ocwindent{0.00em}
\ocwbc{} Numerals \ocwec{}\medskip
\label{nouns.ml:134654}%
\label{nouns.ml:134665}%
\ocwindent{0.00em}
$\ocwlowerid{value}~\ocwlowerid{build\_dva}~\ocwlowerid{entry}~=~$\ocweol
\ocwindent{1.00em}
......@@ -20214,7 +20219,7 @@ The next two functions, as well as the special cases for -vas ought to
disappear, when declension will be called with a fuller morphological tag,
and not just the gender
\ocweol
\label{nouns.ml:140023}%
\label{nouns.ml:140034}%
\medskip
\ocwbegincode{}\ocwindent{0.00em}
$\ocwlowerid{value}~\ocwlowerid{pprvat}~=~$\ocwkw{fun}~\ocweol
......@@ -22163,13 +22168,13 @@ $\ocwlowerid{where}~\ocwlowerid{decl}~=~\ocwupperid{Declined}~\ocwupperid{Noun}~
\ocwindent{0.00em}
;\ocweol
\ocwindent{0.00em}
$\ocwlowerid{value}~\ocwlowerid{enter\_extra\_ifcs}~()~=~$\ocwkw{do}\ocweol
$\ocwlowerid{value}~\ocwlowerid{enter\_extra\_ifcs}~()~=~$\ocwkw{do}~\ocwbc{} archaic retroflexion in cpds Pan{8,4,13} \ocwec{}\ocweol
\ocwindent{1.00em}
\{~\ocwkw{let}~$\ocwlowerid{entry}~=~$\ocwstring{"bhogya"}~\ocwkw{in}~\ocwbc{} for retroflexion in var.sabhogye.na \ocwec{}\ocweol
\{~\ocwkw{let}~$\ocwlowerid{entry}~=~$\ocwstring{"bhogya"}~\ocwkw{in}~\ocwbc{} var.sabhogye.na Meghaduuta 1b \ocwec{}\ocweol
\ocwindent{4.00em}
\ocwkw{let}~$\ocwlowerid{ins\_sg}~=~[~(\ocwupperid{Singular},[~(\ocwupperid{Ins},\ocwlowerid{code}~$\ocwstring{"bhogye.na"}$)~])~]$\ocweol
\ocwindent{4.00em}
\ocwkw{and}~$\ocwlowerid{gen\_pl}~=~[~(\ocwupperid{Plural},[~(\ocwupperid{Gen},\ocwlowerid{code}~$\ocwstring{"bhogyaa.naam"}$)~])~]~$\ocwkw{in}~\ocwkw{do}\ocweol
\ocwkw{and}~$\ocwlowerid{gen\_pl}~=~[~(\ocwupperid{Plural},~[~(\ocwupperid{Gen},\ocwlowerid{code}~$\ocwstring{"bhogyaa.naam"}$)~])~]~$\ocwkw{in}~\ocwkw{do}\ocweol
\ocwindent{4.00em}
\{~$\ocwlowerid{enter1}~\ocwlowerid{entry}~(\ocwupperid{Declined}~\ocwupperid{Noun}~\ocwupperid{Mas}~\ocwlowerid{ins\_sg})$\ocweol
\ocwindent{4.00em}
......@@ -22183,7 +22188,69 @@ $\ocwlowerid{value}~\ocwlowerid{enter\_extra\_ifcs}~()~=~$\ocwkw{do}\ocweol
\ocwindent{4.00em}
\}\ocweol
\ocwindent{1.00em}
;~\ocwkw{let}~$\ocwlowerid{entry}~=~$\ocwstring{"yogin"}~\ocwkw{in}~\ocwbc{} pu.spayogi.nah Renou yogi-fleur? \ocwec{}\ocweol
\ocwindent{4.00em}
\ocwkw{let}~$\ocwlowerid{form}~=~\ocwlowerid{code}~$\ocwstring{"yogi.nas"}~\ocwkw{in}~\ocwkw{do}\ocweol
\ocwindent{4.00em}
\{~$\ocwlowerid{enter1}~\ocwlowerid{entry}~(\ocwupperid{Declined}~\ocwupperid{Noun}~\ocwupperid{Mas}~[~(\ocwupperid{Singular},~[~(\ocwupperid{Gen},\ocwlowerid{form})~])~])$\ocweol
\ocwindent{4.00em}
;~$\ocwlowerid{enter1}~\ocwlowerid{entry}~(\ocwupperid{Declined}~\ocwupperid{Noun}~\ocwupperid{Mas}~[~(\ocwupperid{Singular},~[~(\ocwupperid{Abl},\ocwlowerid{form})~])~])$\ocweol
\ocwindent{4.00em}
;~$\ocwlowerid{enter1}~\ocwlowerid{entry}~(\ocwupperid{Declined}~\ocwupperid{Noun}~\ocwupperid{Neu}~[~(\ocwupperid{Singular},~[~(\ocwupperid{Gen},\ocwlowerid{form})~])~])$\ocweol
\ocwindent{4.00em}
;~$\ocwlowerid{enter1}~\ocwlowerid{entry}~(\ocwupperid{Declined}~\ocwupperid{Noun}~\ocwupperid{Neu}~[~(\ocwupperid{Singular},~[~(\ocwupperid{Abl},\ocwlowerid{form})~])~])$\ocweol
\ocwindent{4.00em}
;~$\ocwlowerid{enter1}~\ocwlowerid{entry}~(\ocwupperid{Declined}~\ocwupperid{Noun}~\ocwupperid{Mas}~[~(\ocwupperid{Plural},~[~(\ocwupperid{Nom},\ocwlowerid{form})~])~])$\ocweol
\ocwindent{4.00em}
;~$\ocwlowerid{enter1}~\ocwlowerid{entry}~(\ocwupperid{Declined}~\ocwupperid{Noun}~\ocwupperid{Mas}~[~(\ocwupperid{Plural},~[~(\ocwupperid{Acc},\ocwlowerid{form})~])~])$\ocweol
\ocwindent{4.00em}
\}\ocweol
\ocwindent{1.00em}
;~\ocwkw{let}~$\ocwlowerid{entry}~=~$\ocwstring{"yuga"}~\ocwkw{in}~\ocwkw{do}~\ocweol
\ocwindent{3.00em}
\{~\ocwkw{let}~$\ocwlowerid{form}~=~\ocwlowerid{code}~$\ocwstring{"yugaa.ni"}~\ocwkw{in}~\ocwkw{do}~\ocwbc{} v.r.sabhayugaa.ni vastrayugaa.ni \ocwec{}\ocweol
\ocwindent{4.00em}
\{~$\ocwlowerid{enter1}~\ocwlowerid{entry}~(\ocwupperid{Declined}~\ocwupperid{Noun}~\ocwupperid{Neu}~[~(\ocwupperid{Plural},~[~(\ocwupperid{Nom},\ocwlowerid{form})~])~])$\ocweol
\ocwindent{4.00em}
;~$\ocwlowerid{enter1}~\ocwlowerid{entry}~(\ocwupperid{Declined}~\ocwupperid{Noun}~\ocwupperid{Neu}~[~(\ocwupperid{Plural},~[~(\ocwupperid{Acc},\ocwlowerid{form})~])~])$\ocweol
\ocwindent{4.00em}
\}\ocweol
\ocwindent{3.00em}
;~\ocwkw{let}~$\ocwlowerid{form}~=~\ocwlowerid{code}~$\ocwstring{"yuge.na"}~\ocwkw{in}~\ocwkw{do}~\ocwbc{} vastrayuge.na kharayuge.na \ocwec{}\ocweol
\ocwindent{4.00em}
\{~$\ocwlowerid{enter1}~\ocwlowerid{entry}~(\ocwupperid{Declined}~\ocwupperid{Noun}~\ocwupperid{Neu}~[~(\ocwupperid{Singular},~[~(\ocwupperid{Ins},\ocwlowerid{form})~])~])$\ocweol
\ocwindent{4.00em}
;~$\ocwlowerid{enter1}~\ocwlowerid{entry}~(\ocwupperid{Declined}~\ocwupperid{Noun}~\ocwupperid{Mas}~[~(\ocwupperid{Singular},~[~(\ocwupperid{Ins},\ocwlowerid{form})~])~])$\ocwbc{}bahu\ocwec{}\ocweol
\ocwindent{4.00em}
\}~\ocweol
\ocwindent{3.00em}
\}~\ocwbc{} NB \ocwstring{"vastrayugi.nas"}, \ocwstring{"vastrayugi.nau"} etc. OK since stem autonomous \ocwec{}\ocweol
\ocwindent{1.00em}
;~\ocwkw{let}~$\ocwlowerid{entry}~=~$\ocwstring{"kaamin"}~\ocwkw{in}~\ocwbc{} svargakaami.nau \ocwec{}\ocweol
\ocwindent{4.00em}
\ocwkw{let}~$\ocwlowerid{form}~=~\ocwlowerid{code}~$\ocwstring{"kaami.nau"}~\ocwkw{in}~\ocwkw{do}\ocweol
\ocwindent{4.00em}
\{~$\ocwlowerid{enter1}~\ocwlowerid{entry}~(\ocwupperid{Declined}~\ocwupperid{Noun}~\ocwupperid{Mas}~[~(\ocwupperid{Dual},~[~(\ocwupperid{Nom},\ocwlowerid{form})~])~])$\ocweol
\ocwindent{4.00em}
;~$\ocwlowerid{enter1}~\ocwlowerid{entry}~(\ocwupperid{Declined}~\ocwupperid{Noun}~\ocwupperid{Mas}~[~(\ocwupperid{Dual},~[~(\ocwupperid{Acc},\ocwlowerid{form})~])~])$\ocweol
\ocwindent{4.00em}
;~$\ocwlowerid{enter1}~\ocwlowerid{entry}~(\ocwupperid{Declined}~\ocwupperid{Noun}~\ocwupperid{Mas}~[~(\ocwupperid{Dual},~[~(\ocwupperid{Voc},\ocwlowerid{form})~])~])$\ocweol
\ocwindent{4.00em}
\}\ocweol
\ocwindent{1.00em}
;~\ocwkw{let}~$\ocwlowerid{entry}~=~$\ocwstring{"gaamin"}~\ocwkw{in}~\ocwbc{} v.r.sagaami.nau \ocwec{}\ocweol
\ocwindent{4.00em}
\ocwkw{let}~$\ocwlowerid{form}~=~\ocwlowerid{code}~$\ocwstring{"gaami.nau"}~\ocwkw{in}~\ocwkw{do}\ocweol
\ocwindent{4.00em}
\{~$\ocwlowerid{enter1}~\ocwlowerid{entry}~(\ocwupperid{Declined}~\ocwupperid{Noun}~\ocwupperid{Mas}~[~(\ocwupperid{Dual},~[~(\ocwupperid{Nom},\ocwlowerid{form})~])~])$\ocweol
\ocwindent{4.00em}
;~$\ocwlowerid{enter1}~\ocwlowerid{entry}~(\ocwupperid{Declined}~\ocwupperid{Noun}~\ocwupperid{Mas}~[~(\ocwupperid{Dual},~[~(\ocwupperid{Acc},\ocwlowerid{form})~])~])$\ocweol
\ocwindent{4.00em}
;~$\ocwlowerid{enter1}~\ocwlowerid{entry}~(\ocwupperid{Declined}~\ocwupperid{Noun}~\ocwupperid{Mas}~[~(\ocwupperid{Dual},~[~(\ocwupperid{Voc},\ocwlowerid{form})~])~])$\ocweol
\ocwindent{4.00em}
\}\ocweol
\ocwindent{1.00em}
\}\ocweol
\ocwindent{0.00em}
;\ocweol
\ocwindent{0.00em}
......@@ -22220,7 +22287,7 @@ $\ocwlowerid{value}~\ocwlowerid{fake\_compute\_decls}~((\ocwlowerid{s},\ocwlower
\ocwendcode{}\ocwindent{0.00em}
For Interface - cache management
\ocweol
\label{nouns.ml:187914}%
\label{nouns.ml:189754}%
\medskip
\ocwbegincode{}\ocwindent{0.00em}
\ocwkw{open}~$\ocwupperid{Bank\_lexer};~$\ocweol
......@@ -22233,7 +22300,7 @@ For Interface - cache management
\ocwindent{0.00em}
\ocwkw{open}~$\ocwupperid{Skt\_morph};$\medskip
\label{nouns.ml:188024}%
\label{nouns.ml:189864}%
\ocwindent{0.00em}
$\ocwlowerid{value}~\ocwlowerid{full\_entry}~=~\ocwupperid{Gram.Entry.}\ocwlowerid{mk}~$\ocwstring{"full\_entry"}\ocweol
\ocwindent{0.00em}
......@@ -30383,7 +30450,7 @@ $\mid{}~$\ocwstring{"vyaa"}~$\rightarrow{}~$\ocwkw{let}~$\ocwlowerid{stem}~=~\oc
\ocwindent{3.00em}
\}\ocweol
\ocwindent{2.00em}
$\mid{}~$\ocwstring{"zuu"}~$\mid{}~$\ocwstring{"zcut\#1"}~$\rightarrow{}~\ocwlowerid{compute\_thematic\_aorista}~\ocwlowerid{weak}~\ocwlowerid{entry}$\ocweol
$\mid{}~$\ocwstring{"zuu"}~$\mid{}~$\ocwstring{"zcut\#1"}~$\mid{}~$\ocwstring{"zram"}~$\rightarrow{}~\ocwlowerid{compute\_thematic\_aorista}~\ocwlowerid{weak}~\ocwlowerid{entry}$\ocweol
\ocwindent{2.00em}
$\mid{}~$\ocwstring{"zru"}~$\rightarrow{}~\ocwlowerid{compute\_thematic\_aorista}~(\ocwlowerid{revcode}~$\ocwstring{"zrav"}$)~\ocwlowerid{entry}$\ocweol
\ocwindent{2.00em}
......@@ -30731,7 +30798,9 @@ $[~$\ocwstring{"gam"}~$\mid{}~$\ocwstring{"g.rdh"}~$\mid{}~$\ocwstring{"zuc\#1"}
\ocwindent{3.00em}
\}\ocweol
\ocwindent{2.00em}
$\mid{}~$\ocwstring{"vac"}~$\rightarrow{}~\ocwlowerid{compute\_thematic\_injuncta}~(\ocwlowerid{revcode}~$\ocwstring{"voc"}$)~\ocwlowerid{entry}~$\ocwbc{} vocat \ocwec{}\ocweol
$\mid{}~$\ocwstring{"zram"}~$\rightarrow{}~\ocwlowerid{compute\_thematic\_injuncta}~\ocwlowerid{weak}~\ocwlowerid{entry}~$\ocwbc{} zramat \ocwec{}\ocweol
\ocwindent{2.00em}
$\mid{}~$\ocwstring{"vac"}~$\rightarrow{}~\ocwlowerid{compute\_thematic\_injuncta}~(\ocwlowerid{revcode}~$\ocwstring{"voc"}$)~\ocwlowerid{entry}~$\ocwbc{} vocat \ocwec{}~\ocweol
\ocwindent{2.00em}
$\mid{}~$\ocwstring{"zru"}~$\rightarrow{}~\ocwlowerid{compute\_thematic\_injuncta}~(\ocwlowerid{revcode}~$\ocwstring{"zrav"}$)~\ocwlowerid{entry}~$\ocwbc{} zravat \ocwec{}\ocweol
\ocwindent{2.00em}
......@@ -31011,7 +31080,7 @@ $]~$\ocweol
\ocwendcode{}\ocwindent{0.00em}
Periphrastic future, Infinitive, Passive future participle in -tavya
\ocweol
\label{verbs.ml:166795}%
\label{verbs.ml:166871}%
\medskip
\ocwbegincode{}\ocwindent{0.00em}
$\ocwlowerid{value}~\ocwlowerid{compute\_peri\_fut}~\ocwlowerid{conj}~\ocwlowerid{perstem}~\ocwlowerid{entry}~=~$\ocweol
......@@ -31143,7 +31212,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:169616}%
\label{verbs.ml:169692}%
\medskip
\ocwbegincode{}\ocwindent{0.00em}
$\ocwlowerid{value}~\ocwlowerid{palatal\_exception}~\ocwlowerid{root}~=~\ocwupperid{List.}\ocwlowerid{mem}~\ocwlowerid{root}$\ocweol
......@@ -31414,7 +31483,7 @@ $\ocwlowerid{value}~\ocwlowerid{record\_pfp\_10}~\ocwlowerid{entry}~\ocwlowerid{
\ocwendcode{}\ocwindent{0.00em}
Absolutive and Past Participle
\ocweol
\label{verbs.ml:175697}%
\label{verbs.ml:175773}%
\medskip
\ocwbegincode{}\ocwindent{0.00em}
$\ocwlowerid{value}~\ocwlowerid{record\_part\_ppp}~\ocwlowerid{ppstem}~\ocwlowerid{entry}~=~$\ocwkw{do}~\ocweol
......@@ -31903,7 +31972,7 @@ $\ocwlowerid{record\_absolutive}~\ocwupperid{Desiderative}~\ocwlowerid{abs\_stem
\ocwendcode{}\ocwindent{0.00em}
Intensive or frequentative
\ocweol
\label{verbs.ml:186378}%
\label{verbs.ml:186454}%
\medskip
\ocwbegincode{}\ocwindent{0.00em}
$\ocwlowerid{value}~\ocwlowerid{compute\_intensive\_presenta}~\ocwlowerid{strong}~\ocwlowerid{weak}~\ocwlowerid{iiflag}~\ocwlowerid{entry}~=$\ocweol
......@@ -32092,7 +32161,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:189737}%
\label{verbs.ml:189813}%
\medskip
\ocwbegincode{}\ocwindent{0.00em}
$\ocwlowerid{value}~\ocwlowerid{compute\_intensivea}~\ocwlowerid{wstem}~\ocwlowerid{sstem}~\ocwlowerid{entry}~\ocwlowerid{third}~=~$\ocweol
......@@ -32131,7 +32200,7 @@ $\ocwlowerid{compute\_athematic\_present3m}~\ocwupperid{Intensive}~\ocwlowerid{i
\ocwendcode{}\ocwindent{0.00em}
Present system
\ocweol
\label{verbs.ml:190613}%
\label{verbs.ml:190689}%
\medskip
\ocwbegincode{}\ocwindent{0.00em}
$\ocwlowerid{value}~\ocwlowerid{compute\_present\_system}~\ocwlowerid{entry}~\ocwlowerid{rstem}~\ocwlowerid{gana}~\ocwlowerid{pada}~\ocwlowerid{third}~=~$\ocweol
......@@ -32736,7 +32805,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:205698}%
\label{verbs.ml:205774}%
\medskip
\ocwbegincode{}\ocwindent{0.00em}
$\ocwlowerid{value}~\ocwlowerid{compute\_passive\_primary}~\ocwlowerid{entry}~\ocwlowerid{ps\_stem}~=~$\ocweol
......@@ -32910,7 +32979,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:210467}%
\label{verbs.ml:210543}%
\medskip
\ocwbegincode{}\ocwindent{0.00em}
$\ocwlowerid{value}~\ocwlowerid{den\_stem\_a}~\ocwlowerid{entry}~=~$\ocwbc{} in general transitive Whitney§1059c \ocwec{}\ocweol
......@@ -33677,7 +33746,7 @@ No attempt for full paradigms, only specific attested forms
\ocwindent{0.00em}
TODO add paradigms for i a. and aas2 m. Whitney§614
\ocweol
\label{verbs.ml:229305}%
\label{verbs.ml:229381}%
\medskip
\ocwbegincode{}\ocwindent{0.00em}
$\ocwlowerid{value}~\ocwlowerid{compute\_subjunctives}~()~=~$\ocweol
......@@ -33748,7 +33817,7 @@ $\ocwlowerid{enter\_subjunctivea}~\ocwupperid{Intensive}~\ocwlowerid{root}~\ocwl
\ocwindent{0.00em}
;\medskip
\label{verbs.ml:230894}%
\label{verbs.ml:230970}%
\ocwindent{0.00em}
$\ocwlowerid{value}~\ocwlowerid{compute\_auxi\_kridantas}~()~=~$\ocweol
\ocwindent{1.00em}
......@@ -40454,7 +40523,7 @@ $\ocwlowerid{value}~\ocwlowerid{initial1}~=$\ocweol
\ocwindent{1.50em}
$[~\ocwupperid{Inde};~\ocwupperid{Iicv};~\ocwupperid{Iicc};~\ocwupperid{Nouv};~\ocwupperid{Nouc};~\ocwupperid{Pron};~\ocwupperid{A};~\ocwupperid{An};~\ocwupperid{Root};~\ocwupperid{Kriv};~\ocwupperid{Kric};~\ocwupperid{Iikv};~\ocwupperid{Iikc}$\ocweol
\ocwindent{1.50em}
;~$\ocwupperid{Peri};~\ocwupperid{Pv};~\ocwupperid{Pvc};~\ocwupperid{Pvv};~\ocwupperid{Pvkv};~\ocwupperid{Pvkc};~\ocwupperid{Iiv};~\ocwupperid{Iivv};~\ocwupperid{Iivc};~\ocwupperid{Iiy};~\ocwupperid{Inv};~\ocwupperid{Ai};~\ocwupperid{Ani}$\ocweol
;~$\ocwupperid{Peri};~\ocwupperid{Pv};~\ocwupperid{Pvkv};~\ocwupperid{Pvkc};~\ocwupperid{Iiv};~\ocwupperid{Iivv};~\ocwupperid{Iivc};~\ocwupperid{Iiy};~\ocwupperid{Inv};~\ocwupperid{Ai};~\ocwupperid{Ani}$\ocweol
\ocwindent{1.50em}
;~$\ocwupperid{Absv};~\ocwupperid{Absc};~\ocwupperid{Inftu};~\ocwupperid{Vocv};~\ocwupperid{Vocc};~\ocwupperid{Vokv};~\ocwupperid{Vokc}~]~@~\ocwlowerid{cached}$\ocweol
\ocwindent{0.00em}
......@@ -40608,7 +40677,7 @@ $]$\ocweol
\ocwendcode{}\ocwindent{0.00em}
accepting: phase -> bool
\ocweol
\label{dispatcher.ml:9305}%
\label{dispatcher.ml:9295}%
\medskip
\ocwbegincode{}\ocwindent{0.00em}
$\ocwlowerid{value}~\ocwlowerid{accepting}~\ocwlowerid{phase}~=~\ocwupperid{List.}\ocwlowerid{mem}~\ocwlowerid{phase}~\ocwlowerid{terminal}$\ocweol
......@@ -40636,7 +40705,7 @@ $]$\ocweol
\ocwbc{} Now consistency check - we check that preverbs usage is consistent with
root px declaration in lexicon \ocwec{}\medskip
\label{dispatcher.ml:9799}%
\label{dispatcher.ml:9789}%
\ocwindent{0.00em}
$\ocwlowerid{value}~\ocwlowerid{assoc\_word}~\ocwlowerid{word}~\ocwlowerid{deco}~=$\ocweol
\ocwindent{1.50em}
......@@ -40668,7 +40737,7 @@ $\ocwupperid{List.}\ocwlowerid{mem}~\ocwlowerid{prev}~\ocwlowerid{pvs}~$\ocwbc{}
\ocwindent{0.00em}
;\medskip
\label{dispatcher.ml:10319}%
\label{dispatcher.ml:10309}%
\ocwindent{0.00em}
$\ocwlowerid{value}~\ocwlowerid{gana\_o}~=~$\ocwkw{fun}~\ocweol
\ocwindent{1.00em}
......@@ -41385,11 +41454,9 @@ $[~(\ocwupperid{Comp}~(\ocwupperid{Pv},\ocwupperid{Peri})~\ocwlowerid{pv}~\ocwlo
\ocwindent{3.00em}
$]$\ocweol
\ocwindent{1.00em}
$\mid{}~[~(\ocwupperid{Abso},\ocwlowerid{rev\_abso\_form},\ocwlowerid{s})~::~[~(\ocwupperid{Pv},\ocwlowerid{prev},\ocwlowerid{sv})~::~\ocwlowerid{r}~]~]~$\ocweol
\ocwindent{1.00em}
$\mid{}~[~(\ocwupperid{Abso},\ocwlowerid{rev\_abso\_form},\ocwlowerid{s})~::~[~(\ocwupperid{Pvv},\ocwlowerid{prev},\ocwlowerid{sv})~::~\ocwlowerid{r}~]~]~$\ocweol
\ocwindent{1.00em}
$\mid{}~[~(\ocwupperid{Abso},\ocwlowerid{rev\_abso\_form},\ocwlowerid{s})~::~[~(\ocwupperid{Pvc},\ocwlowerid{prev},\ocwlowerid{sv})~::~\ocwlowerid{r}~]~]~\rightarrow{}$\ocweol
$\mid{}~[~(\ocwupperid{Abso},\ocwlowerid{rev\_abso\_form},\ocwlowerid{s})~::~[~(\ocwlowerid{ph},\ocwlowerid{prev},\ocwlowerid{sv})~::~\ocwlowerid{r}~]~]~$\ocweol
\ocwindent{5.50em}
\ocwkw{when}~$\ocwlowerid{preverb\_phase}~\ocwlowerid{ph}~\rightarrow{}$\ocweol
\ocwindent{3.00em}
\ocwbc{} Takes care of absolutives in -ya \ocwec{}\ocweol
\ocwindent{3.00em}
......@@ -41526,7 +41593,7 @@ $]$\ocweol
\ocwindent{0.00em}
;\medskip
\label{dispatcher.ml:29870}%
\label{dispatcher.ml:29778}%
\ocwindent{0.00em}
\ocwkw{end};\ocweol
\ocweol
......@@ -44358,7 +44425,7 @@ $[~\ocwupperid{Pv}~\mid{}~\ocwupperid{Pvk}~\mid{}~\ocwupperid{Pvkc}~\mid{}~\ocwu
\ocwindent{1.00em}
$\mid{}~\ocwupperid{Iikv}~\mid{}~\ocwupperid{Iikc}~\mid{}~\ocwupperid{Iiif}~\mid{}~\ocwupperid{A}~\mid{}~\ocwupperid{An}~\mid{}~\ocwupperid{Vok}~\mid{}~\ocwupperid{Vokv}~\mid{}~\ocwupperid{Vokc}~\mid{}~\ocwupperid{Vocv}~\mid{}~\ocwupperid{Vocc}~\mid{}~\ocwupperid{Iiy}~$\ocweol
\ocwindent{1.00em}
$\mid{}~\ocwupperid{Iiv}~\mid{}~\ocwupperid{Iivv}~\mid{}~\ocwupperid{Iivc}~\mid{}~\ocwupperid{Peri}~\mid{}~\ocwupperid{Auxiick}~\rightarrow{}~\ocwupperid{Grey}~$\ocweol
$\mid{}~\ocwupperid{Iiv}~\mid{}~\ocwupperid{Iivv}~\mid{}~\ocwupperid{Iivc}~\mid{}~\ocwupperid{Peri}~\mid{}~\ocwupperid{Auxiick}~\mid{}~\ocwupperid{Pvv}~\mid{}~\ocwupperid{Pvc}~\rightarrow{}~\ocwupperid{Grey}~$\ocweol
\ocwindent{1.00em}
$\mid{}~\ocwupperid{Noun}~\mid{}~\ocwupperid{Noun2}~\mid{}~\ocwupperid{Nouv}~\mid{}~\ocwupperid{Nouc}~\mid{}~\ocwupperid{Krid}~\mid{}~\ocwupperid{Kriv}~\mid{}~\ocwupperid{Kric}~\mid{}~\ocwupperid{Pron}~\mid{}~\ocwupperid{Ifc}~\mid{}~\ocwupperid{Ifc2}$\ocweol
\ocwindent{1.00em}
......@@ -44516,7 +44583,7 @@ $]$\ocweol
\ocwindent{0.00em}
\ocwbc{} End Printing functions \ocwec{}\medskip
\label{parser.ml:5666}%
\label{parser.ml:5678}%
\ocwindent{0.00em}
$\ocwlowerid{value}~\ocwlowerid{rpc}~=~\ocwlowerid{remote\_server\_host}~$\ocweol
\ocwindent{0.00em}
......@@ -44532,7 +44599,7 @@ $\ocwlowerid{value}~\ocwlowerid{rpc}~=~\ocwlowerid{remote\_server\_host}~$\ocweo
\ocwindent{0.00em}
\ocwkw{open}~$\ocwupperid{Paraphrase};~$\ocwbc{} \ocwbegindcode{}$\ocwlowerid{display\_penalties}~\ocwlowerid{print\_sem}~\ocwlowerid{print\_role}$\ocwenddcode{} \ocwec{}\medskip
\label{parser.ml:5918}%
\label{parser.ml:5930}%
\ocwindent{0.00em}
$\ocwlowerid{value}~\ocwlowerid{query}~=~$\ocwbt{ref}~\ocwstring{""}~\ocwbc{} ugly - stores the query string \ocwec{}\ocweol
\ocwindent{0.00em}
......@@ -44944,7 +45011,7 @@ $]$\ocweol
\ocwindent{0.00em}
;\medskip
\label{parser.ml:14035}%
\label{parser.ml:14047}%
\ocwindent{0.00em}
$\ocwlowerid{value}~\ocwlowerid{sort\_check}~\ocwlowerid{cpts}~=~$\ocweol
\ocwindent{1.00em}
......@@ -44954,7 +45021,7 @@ $\ocwupperid{List.}\ocwlowerid{sort}~\ocwlowerid{compare\_index}~\ocwlowerid{cpt
\ocwindent{0.00em}
;\medskip
\label{parser.ml:14148}%
\label{parser.ml:14160}%
\ocwindent{0.00em}
$\ocwlowerid{value}~\ocwlowerid{parser\_engine}~()~=~$\ocwkw{do}\ocweol
\ocwindent{0.00em}
......@@ -119,7 +119,7 @@ value cached = (* potentially cached lexicon acquisitions *)
value initial1 =
(* All phases but Ifc, Abso, Auxi, Auxik, Auxiick, Lopa, Lopak. *)
[ Inde; Iicv; Iicc; Nouv; Nouc; Pron; A; An; Root; Kriv; Kric; Iikv; Iikc
; Peri; Pv; Pvc; Pvv; Pvkv; Pvkc; Iiv; Iivv; Iivc; Iiy; Inv; Ai; Ani
; Peri; Pv; Pvkv; Pvkc; Iiv; Iivv; Iivc; Iiy; Inv; Ai; Ani
; Absv; Absc; Inftu; Vocv; Vocc; Vokv; Vokc ] @ cached
and initial2 = (* simplified segmenter with less phases, no generation *)
[ Inde; Iic2; Noun2; Pron; Root; Pv; Iiv; Absv; Absc ]
......@@ -589,9 +589,8 @@ value validate out = match out with
[ (Comp (Pv,Peri) pv peri_form,cpd_form,s) :: r ]
else []
]
| [ (Abso,rev_abso_form,s) :: [ (Pv,prev,sv) :: r ] ]
| [ (Abso,rev_abso_form,s) :: [ (Pvv,prev,sv) :: r ] ]
| [ (Abso,rev_abso_form,s) :: [ (Pvc,prev,sv) :: r ] ] ->
| [ (Abso,rev_abso_form,s) :: [ (ph,prev,sv) :: r ] ]
when preverb_phase ph ->
(* Takes care of absolutives in -ya *)
let pv = Word.mirror prev in
let pv_str = Canon.decode pv
......
......@@ -4,7 +4,7 @@
(* *)
(* Gérard Huet *)
(* *)
(* ©2018 Institut National de Recherche en Informatique et en Automatique *)
(* ©2019 Institut National de Recherche en Informatique et en Automatique *)
(**************************************************************************)
(*i module Int_sandhi = struct i*)
......@@ -511,7 +511,8 @@ let adoh = duhify (Encode.rev_code_string "adoh") in
assert (decode (int_sandhi adoh (code "t")) = "adhok"); (* she milked - not "adho.t" *)
(* Not fully correct - still to be improved
Special cases - to be accommodated at proper point in the derivation Macdonell §60 footnote 1 p 26
Special cases - to be accommodated at proper point in the derivation
cf. Macdonell §60 footnote 1 p 26
d is assimilated before primary suffix -na: ad+na -> anna
t and d are assimilated before secondary suffixes -mat and -maya: vidyunmat m.rnmaya *)
......
......@@ -1819,7 +1819,7 @@ value build_mas_ac stem entry =
]
;
value build_pums pum pums entry = (* for pu.ms et napu.ms *)
(* hi.ms pu.ms no retroflexion of s - Whitney§183a *)
(* hi.ms pu.ms no retroflexion of s - Whitney§183a Kale §113 *)
let decline case suff = (case,List2.unstack pum (code suff))
and declines case suff = (case,List2.unstack pums (code suff)) in
enter entry
......@@ -5905,17 +5905,48 @@ value compute_extra iic_only_stems = do
; [compute_extra_ifc bahu_suffixes] eg Fem -padaa for meter formation *)
}
;
value enter_extra_ifcs () = do
{ let entry = "bhogya" in (* for retroflexion in var.sabhogye.na *)
value enter_extra_ifcs () = do (* archaic retroflexion in cpds Pan{8,4,13} *)
{ let entry = "bhogya" in (* var.sabhogye.na Meghaduuta 1b *)
let ins_sg = [ (Singular,[ (Ins,code "bhogye.na") ]) ]
and gen_pl = [ (Plural,[ (Gen,code "bhogyaa.naam") ]) ] in do
and gen_pl = [ (Plural, [ (Gen,code "bhogyaa.naam") ]) ] in do
{ enter1 entry (Declined Noun Mas ins_sg)
; enter1 entry (Declined Noun Mas gen_pl)
; enter1 entry (Declined Noun Neu ins_sg)
; enter1 entry (Declined Noun Neu gen_pl)
; enter1 entry (Declined Noun Fem gen_pl)
}
}
; let entry = "yogin" in (* pu.spayogi.nah Renou yogi-fleur? *)
let form = code "yogi.nas" in do
{ enter1 entry (Declined Noun Mas [ (Singular, [ (Gen,form) ]) ])
; enter1 entry (Declined Noun Mas [ (Singular, [ (Abl,form) ]) ])
; enter1 entry (Declined Noun Neu [ (Singular, [ (Gen,form) ]) ])
; enter1 entry (Declined Noun Neu [ (Singular, [ (Abl,form) ]) ])
; enter1 entry (Declined Noun Mas [ (Plural, [ (Nom,form) ]) ])
; enter1 entry (Declined Noun Mas [ (Plural, [ (Acc,form) ]) ])
}
; let entry = "yuga" in do
{ let form = code "yugaa.ni" in do (* v.r.sabhayugaa.ni vastrayugaa.ni *)
{ enter1 entry (Declined Noun Neu [ (Plural, [ (Nom,form) ]) ])
; enter1 entry (Declined Noun Neu [ (Plural, [ (Acc,form) ]) ])
}
; let form = code "yuge.na" in do (* vastrayuge.na kharayuge.na *)
{ enter1 entry (Declined Noun Neu [ (Singular, [ (Ins,form) ]) ])
; enter1 entry (Declined Noun Mas [ (Singular, [ (Ins,form) ]) ])(*bahu*)
}
} (* NB "vastrayugi.nas", "vastrayugi.nau" etc. OK since stem autonomous *)
; let entry = "kaamin" in (* svargakaami.nau *)
let form = code "kaami.nau" in do
{ enter1 entry (Declined Noun Mas [ (Dual, [ (Nom,form) ]) ])
; enter1 entry (Declined Noun Mas [ (Dual, [ (Acc,form) ]) ])
; enter1 entry (Declined Noun Mas [ (Dual, [ (Voc,form) ]) ])
}
; let entry = "gaamin" in (* v.r.sagaami.nau *)
let form = code "gaami.nau" in do
{ enter1 entry (Declined Noun Mas [ (Dual, [ (Nom,form) ]) ])
; enter1 entry (Declined Noun Mas [ (Dual, [ (Acc,form) ]) ])
; enter1 entry (Declined Noun Mas [ (Dual, [ (Voc,form) ]) ])
}
}
;
value enter_extra_iifcs () = do
{ let entry = "ahan" in (* for -aha- like pu.nyaahavaacanam *)
......
......@@ -50,8 +50,8 @@ value voices_of = fun
| "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"
| "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"
| "miil" | "mu.s#1" | "muh" | "muurch" | "m.r.d" | "m.rz" | "mnaa" | "mre.d"
......@@ -64,7 +64,7 @@ value voices_of = fun
| "v.rj" | "v.r.s" | "v.rh" | "ven" | "vyac"| "vyadh" | "vraj" | "vrazc"
| "za.ms" | "zak" | "zam#1" | "zam#2" | "zal" | "zaz" | "zas" | "zaas"
| "zi.s" | "ziil" | "zuc#1" | "zudh" | "zumbh" | "zu.s" | "zuu" | "z.rr"
| "zcut#1" | "zram" | "zru" | "zli.s" | "zvas#1" | ".s.thiiv" | "sa~nj"
| "zcut#1" | "zraa" | "zru" | "zli.s" | "zvas#1" | ".s.thiiv" | "sa~nj"
| "sad#1" | "sap#1" | "saa#1" | "sidh#1" | "sidh#2" | "siiv" | "sur" | "s.r"
| "s.rj#1" | "s.rp" | "skand" | "skhal" | "stan" | "stubh" | "sthag" | "snaa"
| "snih#1" | "snu" | "snuh#1" | "sp.r" | "sphal" | "sphu.t" | "sphur"
......@@ -80,6 +80,7 @@ value voices_of = fun
(*| "van" Atma needed for vanute *)
(*| "mah" Atma needed for pft. maamahe *)
(*| "cit#1" Atma needed for pft. cikite *)
(*| "zram" Atma needed for vizramate *)
(*| "kaafk.s" | "han#1" occur also in Atma in BhG: kaafk.se hani.sye *)
(*| "has" Atma needed for hasate *)
(*| "zu.s" Atma for zu.syate WR epic *)
......@@ -124,9 +125,9 @@ value voices_of = fun
| "lafgh" | "lak.s" | "labh" | "la.s" | "lip" | "lih#1" | "lup" | "luu#1"
| "vad" | "vap#1" | "vap#2" | "val" | "vah#1" | "vaa#3" | "vic" | "vij"
| "viij" | "v.r#2" | "v.rt#1" | "vyath" | "vyaa" | "zap" | "zaa" | "zu.s"
| "zubh#1" | "zyaa" | "zri" | "san#1" | "sah#1" | "sic" | "su#2" | "suud"
| "stambh" | "stu" | "st.rr" | "sthaa#1" | "sp.rz#1" | "sp.rh" | "smi"
| "syand" | "svad" | "had" | "hikk" | "hu" | "huu" | "h.r#1" ] *)
| "zubh#1" | "zyaa" | "zram" | "zri" | "san#1" | "sah#1" | "sic" | "su#2"
| "suud" | "stambh" | "stu" | "st.rr" | "sthaa#1" | "sp.rz#1" | "sp.rh"
| "smi" | "syand" | "svad" | "had" | "hikk" | "hu" | "huu" | "h.r#1" ] *)
(* + corr. "pa.th" | "sthaa#1" | "praz" | "k.rr" | "p.rc" | "bandh" *)
(* NB. "ah" "rip" "vadh" have no pr, "mand2" is fictitious *)
(* "iiz1", "lii" and "knuu" allowed Para in future *)
......@@ -291,6 +292,7 @@ value voices_of_pv upasarga gana = fun (* gana only used for "tap" "i" ".r" *)
| _ -> Para
]
| "zii#1" -> if upasarga = "sam" then Ubha else Atma
| "zram" -> if upasarga = "vi" then Ubha (* epic vizramate *) else Para
| "krii" -> match upasarga with
[ "vi" | "pari" | "ava" -> Atma
| _ -> Para (* \Pan{1,3,18} *)
......@@ -298,8 +300,8 @@ value voices_of_pv upasarga gana = fun (* gana only used for "tap" "i" ".r" *)
(* Next three equivalent to marking "unused" in lexicon *)
| "ta~nc" | "saa#1" | "zam#2" | "zal" (* also "khyaa" ? *) ->
match upasarga with
[ "" -> raise Unattested
| _ -> Para
[ "" -> raise Unattested (* thus braa.hmasya "Ô Brahmane, tue" unrecognized *)
| _ -> Para
]
| "loc" | "zrambh" | "hnu" -> match upasarga with
[ "" -> raise Unattested
......
......@@ -4067,7 +4067,7 @@ value compute_aorist entry =
{ compute_thematic_aorista stem entry
; compute_thematic_aoristm stem entry
}
| "zuu" | "zcut#1" -> compute_thematic_aorista weak entry
| "zuu" | "zcut#1" | "zram" -> compute_thematic_aorista weak entry
| "zru" -> compute_thematic_aorista (revcode "zrav") entry
| "khyaa" -> compute_thematic_aorista (revcode "khy") entry
| "as#2" -> compute_thematic_aorista (revcode "asth") entry
......@@ -4241,7 +4241,8 @@ value compute_injunctive entry =
{ compute_thematic_injuncta weak entry
; compute_thematic_injunctm weak entry (* middle is very rare *)
}
| "vac" -> compute_thematic_injuncta (revcode "voc") entry (* vocat *)
| "zram" -> compute_thematic_injuncta weak entry (* zramat *)
| "vac" -> compute_thematic_injuncta (revcode "voc") entry (* vocat *)
| "zru" -> compute_thematic_injuncta (revcode "zrav") entry (* zravat *)
| _ -> ()
]
......
......@@ -8,4 +8,4 @@
(**************************************************************************)
(* Generated by make version - see main Makefile *)
value version="3.15" and version_date="2019-04-24";
value version="3.16" and version_date="2019-05-09";
VERSION='3.15'
DATE='2019-04-24'
VERSION='3.16'
DATE='2019-05-09'
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