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

Taddhitas generative are restored for mode simple; thus tattva, sattva, etc are in bank nouns2

parent a7ebec8c
......@@ -31032,6 +31032,8 @@ $\mid{}~$\ocwstring{"k.r\#1"}~$\rightarrow{}~\ocwlowerid{record}~$\ocwstring{"ka
\ocwindent{1.00em}
$\mid{}~$\ocwstring{"khan"}~$\rightarrow{}~\ocwlowerid{record}~$\ocwstring{"khaanam"}\ocweol
\ocwindent{1.00em}
$\mid{}~$\ocwstring{"j\~{}naa\#1"}~$\rightarrow{}~\ocwlowerid{record}~$\ocwstring{"j\~{}naayam"}\ocweol
\ocwindent{1.00em}
$\mid{}~$\ocwstring{"t.r.s\#1"}~$\rightarrow{}~\ocwlowerid{record}~$\ocwstring{"tar.sam"}\ocweol
\ocwindent{1.00em}
$\mid{}~$\ocwstring{"daa\#1"}~$\rightarrow{}~\ocwlowerid{record}~$\ocwstring{"daayam"}\ocweol
......@@ -31141,7 +31143,7 @@ $\ocwlowerid{record\_absolutive}~\ocwupperid{Desiderative}~\ocwlowerid{abs\_stem
\ocwendcode{}\ocwindent{0.00em}
Intensive or frequentative
\ocweol
\label{verbs.ml:180563}%
\label{verbs.ml:180598}%
\medskip
\ocwbegincode{}\ocwindent{0.00em}
$\ocwlowerid{value}~\ocwlowerid{compute\_intensive\_presenta}~\ocwlowerid{strong}~\ocwlowerid{weak}~\ocwlowerid{iiflag}~\ocwlowerid{entry}~=$\ocweol
......@@ -31324,7 +31326,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:183763}%
\label{verbs.ml:183798}%
\medskip
\ocwbegincode{}\ocwindent{0.00em}
$\ocwlowerid{value}~\ocwlowerid{compute\_intensivea}~\ocwlowerid{wstem}~\ocwlowerid{sstem}~\ocwlowerid{entry}~\ocwlowerid{third}~=~$\ocweol
......@@ -31363,7 +31365,7 @@ $\ocwlowerid{compute\_athematic\_present3m}~\ocwupperid{Intensive}~\ocwlowerid{i
\ocwendcode{}\ocwindent{0.00em}
Present system
\ocweol
\label{verbs.ml:184640}%
\label{verbs.ml:184675}%
\medskip
\ocwbegincode{}\ocwindent{0.00em}
$\ocwlowerid{value}~\ocwlowerid{compute\_present\_system}~\ocwlowerid{entry}~\ocwlowerid{rstem}~\ocwlowerid{gana}~\ocwlowerid{pada}~\ocwlowerid{third}~=~$\ocweol
......@@ -31960,7 +31962,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:199593}%
\label{verbs.ml:199628}%
\medskip
\ocwbegincode{}\ocwindent{0.00em}
$\ocwlowerid{value}~\ocwlowerid{compute\_passive\_primary}~\ocwlowerid{entry}~\ocwlowerid{ps\_stem}~=~$\ocweol
......@@ -32136,7 +32138,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:204444}%
\label{verbs.ml:204479}%
\medskip
\ocwbegincode{}\ocwindent{0.00em}
$\ocwlowerid{value}~\ocwlowerid{den\_stem\_a}~\ocwlowerid{entry}~=~$\ocwbc{} in general transitive Whitney§1059c \ocwec{}\ocweol
......@@ -32768,16 +32770,6 @@ $\ocwlowerid{record\_pfp\_aniiya}~\ocwupperid{Causative}~\ocwlowerid{cpstem}~\oc
\ocwbc{} Passive past participle and absolutives \ocwec{}\ocweol
\ocwindent{2.50em}
;~$\ocwlowerid{record\_pppca}~\ocwlowerid{cpstem}~\ocwlowerid{cstem}~\ocwlowerid{entry}$\ocweol
\ocwindent{2.50em}
;~\ocwkw{match}~$\ocwlowerid{entry}~$\ocwkw{with}~\ocwbc{} additional forms \ocwec{}\ocweol
\ocwindent{3.50em}
$[~$\ocwstring{"j\~{}naa\#1"}~$\rightarrow{}~$\ocwkw{let}~$\ocwlowerid{st}~=~\ocwlowerid{revcode}~$\ocwstring{"j\~{}nap"}~\ocwkw{in}~\ocwbc{} optional j~napita \ocwec{}\ocweol
\ocwindent{11.00em}
$\ocwlowerid{record\_pppca}~\ocwlowerid{st}~\ocwlowerid{st}~\ocwlowerid{entry}~$\ocwbc{} vet \Pan{7,2,27} \ocwec{}\ocweol
\ocwindent{3.50em}
$\mid{}~\ocwlowerid{\_}~\rightarrow{}~()$\ocweol
\ocwindent{3.50em}
$]~$\ocweol
\ocwindent{3.50em}
\ocwbc{} Periphrastic future, Infinitive, Gerundive/pfp in -tavya \ocwec{}\ocweol
\ocwindent{2.50em}
......@@ -32894,7 +32886,7 @@ Various Vedic subjunctives needed for citations Whitney§562
\ocwindent{0.00em}
No attempt for full paradigms, only specific attested forms
\ocweol
\label{verbs.ml:222757}%
\label{verbs.ml:222574}%
\medskip
\ocwbegincode{}\ocwindent{0.00em}
$\ocwlowerid{value}~\ocwlowerid{compute\_subjunctives}~()~=$\ocweol
......@@ -32966,7 +32958,7 @@ $\ocwlowerid{enter\_subjunctivea}~\ocwupperid{Intensive}~\ocwlowerid{root}~\ocwl
\ocwendcode{}\ocwindent{0.00em}
Extra participial forms - intensive, desiderative, no present, etc
\ocweol
\label{verbs.ml:224329}%
\label{verbs.ml:224146}%
\medskip
\ocwbegincode{}\ocwindent{0.00em}
$\ocwlowerid{value}~\ocwlowerid{compute\_extra\_participles}~()~=~$\ocwkw{do}\ocweol
......@@ -33045,6 +33037,22 @@ $\ocwlowerid{value}~\ocwlowerid{compute\_extra\_car}~()~=~$\ocwkw{do}\ocweol
\ocwindent{1.00em}
\}\ocweol
\ocwindent{0.50em}
\ocwkw{and}~$\ocwlowerid{compute\_extra\_jnaa}~()~=$\ocweol
\ocwindent{1.00em}
\ocwkw{let}~$\ocwlowerid{entry}~=~$\ocwstring{"j\~{}naa\#1"}~\ocwkw{in}~\ocwbc{} j~napta vet \Pan{7,2,27} \ocwec{}\ocweol
\ocwindent{1.00em}
\ocwkw{let}~$\ocwlowerid{cstem}~=~\ocwlowerid{revcode}~$\ocwstring{"j\~{}nap"}~\ocwkw{in}~\ocweol
\ocwindent{1.00em}
\ocwkw{let}~$\ocwlowerid{ppstem}~=~[~1~::~[~32~::~\ocwlowerid{cstem}~]~]~$\ocwbc{} j~napta \ocwec{}~\ocwkw{in}~\ocwkw{do}~\ocweol
\ocwindent{1.00em}
\{~$\ocwlowerid{record\_part}~(\ocwupperid{Ppp\_}~\ocwupperid{Causative}~\ocwlowerid{ppstem}~\ocwlowerid{entry})$\ocweol
\ocwindent{1.00em}
;~$\ocwlowerid{record\_part}~(\ocwupperid{Pppa\_}~\ocwupperid{Causative}~[~45~::~\ocwlowerid{ppstem}~]~\ocwlowerid{entry})~$\ocwbc{} pp-vat \ocwec{}\ocweol
\ocwindent{1.00em}
;~$\ocwlowerid{perif}~\ocwupperid{Causative}~\ocwlowerid{cstem}~\ocwlowerid{entry}~$\ocweol
\ocwindent{1.00em}
\}\ocweol
\ocwindent{0.50em}
\ocwkw{and}~$\ocwlowerid{compute\_extra\_zru}~()~=~$\ocweol
\ocwindent{1.00em}
$\ocwlowerid{enter1}~$\ocwstring{"zru"}~\ocwbc{} ved écoute \ocwec{}~\ocweol
......@@ -33221,6 +33229,8 @@ $\ocwlowerid{value}~\ocwlowerid{compute\_extra}~()~=~$\ocwkw{do}\ocweol
\ocwindent{1.00em}
;~$\ocwlowerid{compute\_extra\_cud}~()~$\ocweol
\ocwindent{1.00em}
;~$\ocwlowerid{compute\_extra\_jnaa}~()~$\ocweol
\ocwindent{1.00em}
;~$\ocwlowerid{compute\_extra\_dhaa}~()~$\ocweol
\ocwindent{1.00em}
;~$\ocwlowerid{compute\_extra\_nind}~()~$\ocweol
......@@ -33315,7 +33325,9 @@ $\mid{}~$\ocwstring{"car"}~$\rightarrow{}~\ocwlowerid{compute\_extra\_car}~()$\o
\ocwindent{3.00em}
$\mid{}~$\ocwstring{"cud"}~$\rightarrow{}~\ocwlowerid{compute\_extra\_cud}~()~$\ocweol
\ocwindent{3.00em}
$\mid{}~$\ocwstring{"dhaa\#1"}~$\rightarrow{}~\ocwlowerid{compute\_extra\_dhaa}~()$\ocweol
$\mid{}~$\ocwstring{"j\~{}naa\#1"}$\rightarrow{}~\ocwlowerid{compute\_extra\_jnaa}~()~$\ocweol
\ocwindent{3.00em}
$\mid{}~$\ocwstring{"dhaa\#1"}~$\rightarrow{}~\ocwlowerid{compute\_extra\_dhaa}~()~$\ocweol
\ocwindent{3.00em}
$\mid{}~$\ocwstring{"nind"}~$\rightarrow{}~\ocwlowerid{compute\_extra\_nind}~()$\ocweol
\ocwindent{3.00em}
......@@ -5043,7 +5043,7 @@ value compute_nouns_stem_form e stem d p =
]
| [ 5 :: r2 ] -> match r2 with
[ [ 24 :: [ 1 :: [ 48 ] ] ] (* saju.s *)
-> build_us Mas r2 e (* Kale §114 *)
-> build_us Mas r2 e (* Kale§114 *)
| _ -> build_root Mas stem e
]
| _ -> build_root Mas stem e
......@@ -5200,7 +5200,7 @@ value compute_nouns_stem_form e stem d p =
| [ 47; 6; 42 ] (* yuu.san *)
| [ 47; 12; 34 ] (* do.san *)
| [ 48; 1 ] (* asan *)
| [ 48; 2 ] (* aasan *) -> build_sp_an r2 e (* Whitney §432 *)
| [ 48; 2 ] (* aasan *) -> build_sp_an r2 e (* Whitney§432 *)
| [ 35; 6 ] (* uudhan *) -> build_uudhan r2 e
| [ 41 :: r3 ] (* -man *) -> match e with
[ "brahman" -> build_neu_brahman e
......@@ -5341,12 +5341,12 @@ value compute_nouns_stem_form e stem d p =
else do
{ if r1=[ 22; 1 ] (* -acii *) then () (* seulement avec px *)
else build_fem_ii r1 e
; match r1 with (* vedic forms Whitney §355-356 *)
; match r1 with (* vedic forms Whitney§355-356 *)
[ [ 45; 1 ] (* avii *)
| [ 34; 1; 36 ] (* nadii *)
| [ 41; 43; 6; 48 ] (* suurmii *)
| [ 41; 47; 17; 1; 44 ] (* lak.smii *)
| [ 43; 1; 32 ] (* tarii *) (* Whitney §363a *)
| [ 43; 1; 32 ] (* tarii *) (* Whitney§363a *)
| [ 43; 32; 36; 1; 32 ] (* tantrii *)
| [ 43; 1; 32; 48 ] (* starii *) (* Deshpande u.naadisuutra *)
-> build_poly_ii Fem r1 e
......@@ -5358,7 +5358,7 @@ value compute_nouns_stem_form e stem d p =
if monosyl r1 || compound_monosyl_uu r1 then build_mono_uu Fem r1 e
else do
{ build_fem_uu r1 e
; match r1 with (* vedic forms Whitney §355-356 *)
; match r1 with (* vedic forms Whitney§355-356 *)
[ [ 35; 1; 45 ] (* vadhuu *)
| [ 36; 1; 32 ] (* tanuu *)
| [ 41; 1; 22 ] (* camuu *)
......@@ -5600,7 +5600,7 @@ value iic_indecl = (* should be lexicalized *)
; "yathaa" (* yathaanirdi.s.ta *)
; "vinaa" (* vinaabhava *)
; "satraa" (* satraajit *)
; "saha" (* problematic -- overgenerates *)
; "saha#2" (* problematic -- overgenerates *)
; "saak.saat"
; "saaci"
]
......
......@@ -8,4 +8,4 @@
(**************************************************************************)
(* Generated by make version - see main Makefile *)
value version="3.07" and version_date="2018-05-26";
value version="3.08" and version_date="2018-06-13";
VERSION='3.07'
DATE='2018-05-26'
VERSION='3.08'
DATE='2018-06-13'
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