Commit 18d4a83b authored by Gérard Huet's avatar Gérard Huet

Fix Interface.is_conflicting caakiirti.h

parent 83e7d62a
...@@ -4,7 +4,7 @@ ...@@ -4,7 +4,7 @@
(* *) (* *)
(* Gérard Huet *) (* 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 Inflected = struct i*) (*i module Inflected = struct i*)
...@@ -113,7 +113,7 @@ value iivs = ref (Deco.empty : inflected_map) ...@@ -113,7 +113,7 @@ value iivs = ref (Deco.empty : inflected_map)
value add_morphvi w d i = value add_morphvi w d i =
iivs.val := Lexmap.addl iivs.val w (d w,i) iivs.val := Lexmap.addl iivs.val w (d w,i)
; ;
(* finite forms of auxiliary roots k.r bhuu as *) (* finite forms of auxiliary roots k.r bhuu as plus infinitives and gerunds *)
value auxi = ref (Deco.empty : inflected_map) value auxi = ref (Deco.empty : inflected_map)
; ;
value add_morphauxi w d i = value add_morphauxi w d i =
......
...@@ -227,7 +227,7 @@ value is_conflicting ((w,tr,ph,k) as segment) = ...@@ -227,7 +227,7 @@ value is_conflicting ((w,tr,ph,k) as segment) =
else let l' = seg_length w' in else let l' = seg_length w' in
if (k'<=k && k'+l'-1>k) (* w inside w' *) if (k'<=k && k'+l'-1>k) (* w inside w' *)
|| (k'<=k && k'+l'-1>=k && l=1) (* w is a or aa *) || (k'<=k && k'+l'-1>=k && l=1) (* w is a or aa *)
(* This condition is necessary for the overlapping case *) (* This condition is necessary for the overlapping case *)
|| (k<=k' && k+l-1>k') then || (k<=k' && k+l-1>k') then
if k+l-1=k' then let r' = Word.mirror w' in match_tr tr if k+l-1=k' then let r' = Word.mirror w' in match_tr tr
(* This is to check for the overlapping case, occurs when [k=k', l=1]. (* This is to check for the overlapping case, occurs when [k=k', l=1].
...@@ -246,19 +246,19 @@ value is_conflicting ((w,tr,ph,k) as segment) = ...@@ -246,19 +246,19 @@ value is_conflicting ((w,tr,ph,k) as segment) =
(* For the case with [l=1], this is to check whether w is the only (* For the case with [l=1], this is to check whether w is the only
possible v for w', in which case it is an overlap returning a blue sign. possible v for w', in which case it is an overlap returning a blue sign.
If w' has any other possible v's, there is a conflict. *) If w' has any other possible v's, there is a conflict. *)
where rec match_tr' = fun (* This may only occur if w=[1] (a) and w' ends in a or aa *)
[ [] -> does_conflict rest (* NB. In naabhaava.h caakiirti.h a should be marked blue
| [ v :: rst ] -> match v with but in mahaajana.h after checking mahaa a should not be marked blue *)
[ [] -> does_conflict rest where match_tr' = fun
| _ -> v = w || match_tr' rst [ [ v ] -> not (v = w) || does_conflict rest
] | _ -> True
] ]
else True else True
else does_conflict rest else does_conflict rest
] ]
] ]
; ;
value rec find_conflict_seg acc l = fun value rec find_conflict_seg acc l = fun
[ [] -> List.rev acc [ [] -> List.rev acc
| [ (w1,tr,phase,k) :: rest ] -> | [ (w1,tr,phase,k) :: rest ] ->
let conflict = is_conflicting (w1,tr,phase,k) in let conflict = is_conflicting (w1,tr,phase,k) in
......
...@@ -5422,6 +5422,7 @@ value den_stem_m entry = (* in general intransitive or reflexive Whitney§1059c ...@@ -5422,6 +5422,7 @@ value den_stem_m entry = (* in general intransitive or reflexive Whitney§1059c
-> trunc (trunc rstem) -> trunc (trunc rstem)
| "tavi.sa" | "citra" (* do \Pan{3,1,19} *) | "sajja" | "tavi.sa" | "citra" (* do \Pan{3,1,19} *) | "sajja"
-> [ 4 :: trunc_a rstem ] (* -()iiyate *) -> [ 4 :: trunc_a rstem ] (* -()iiyate *)
| "arth" -> [ 1 :: trunc_a rstem ] (* arthayate for lexicon access *)
| "apsaras" | "sumanas" (* act as, become \Pan{3,1,11-12} *) | "apsaras" | "sumanas" (* act as, become \Pan{3,1,11-12} *)
| "unmanas" | "unmanas"
| "uu.sman" (* emit \Pan{3,1,16} *) | "uu.sman" (* emit \Pan{3,1,16} *)
......
...@@ -8,4 +8,4 @@ ...@@ -8,4 +8,4 @@
(**************************************************************************) (**************************************************************************)
(* Generated by make version - see main Makefile *) (* Generated by make version - see main Makefile *)
value version="3.13" and version_date="2019-02-22"; value version="3.13" and version_date="2019-03-01";
VERSION='3.13' VERSION='3.13'
DATE='2019-02-22' DATE='2019-03-01'
No preview for this file type
...@@ -5,7 +5,7 @@ ...@@ -5,7 +5,7 @@
<title>The Sanskrit Heritage Site FAQ</title> <title>The Sanskrit Heritage Site FAQ</title>
<meta name="author" content="G&#233;rard Huet"> <meta name="author" content="G&#233;rard Huet">
<meta property="dc:datecopyrighted" content="2018"> <meta property="dc:datecopyrighted" content="2019">
<meta property="dc:rightsholder" content="G&#233;rard Huet"> <meta property="dc:rightsholder" content="G&#233;rard Huet">
<meta name ="keywords" content="india,dictionary,indology,sanskrit,lexicography,linguistics,indo-european,dictionnaire,sanscrit,panini,indology,linguistics"> <meta name ="keywords" content="india,dictionary,indology,sanskrit,lexicography,linguistics,indo-european,dictionnaire,sanscrit,panini,indology,linguistics">
<meta name="description" content="This site provides tools for Sanskrit processing: dictionary search, morphology generation and analysis, segmentation, tagging and parsing."> <meta name="description" content="This site provides tools for Sanskrit processing: dictionary search, morphology generation and analysis, segmentation, tagging and parsing.">
...@@ -554,7 +554,7 @@ Some of them are kind enough to send us their appreciations, please visit our ...@@ -554,7 +554,7 @@ Some of them are kind enough to send us their appreciations, please visit our
<a href="DICO/corpus.#LANG.html"><strong>Corpus</strong></a> | <a href="DICO/corpus.#LANG.html"><strong>Corpus</strong></a> |
<a href="faq.#LANG.html"><strong>Help</strong></a> | <a href="faq.#LANG.html"><strong>Help</strong></a> |
<a href="portal.#LANG.html"><strong>Portal</strong></a> <a href="portal.#LANG.html"><strong>Portal</strong></a>
</td></tr><tr><td>&#169; G&#233;rard Huet 1994-2018</td></tr></table></td><td> </td></tr><tr><td>&#169; G&#233;rard Huet 1994-2019</td></tr></table></td><td>
<a href="http://www.inria.fr/"> <a href="http://www.inria.fr/">
<img src="IMAGES/logo_inria.png" alt="Logo Inria" height="50"></a> <img src="IMAGES/logo_inria.png" alt="Logo Inria" height="50"></a>
<br></td></tr></table></div> <br></td></tr></table></div>
......
...@@ -5,7 +5,7 @@ ...@@ -5,7 +5,7 @@
<title>The Sanskrit Heritage Engine Reference Manual</title> <title>The Sanskrit Heritage Engine Reference Manual</title>
<meta name="author" content="G&#233;rard Huet"> <meta name="author" content="G&#233;rard Huet">
<meta property="dc:datecopyrighted" content="2018"> <meta property="dc:datecopyrighted" content="2019">
<meta property="dc:rightsholder" content="G&#233;rard Huet"> <meta property="dc:rightsholder" content="G&#233;rard Huet">
<meta name ="keywords" content="india,dictionary,indology,sanskrit,lexicography,linguistics,indo-european,dictionnaire,sanscrit,panini,indology,linguistics"> <meta name ="keywords" content="india,dictionary,indology,sanskrit,lexicography,linguistics,indo-european,dictionnaire,sanscrit,panini,indology,linguistics">
<meta name="description" content="This is an online manual to the Sanskrit <meta name="description" content="This is an online manual to the Sanskrit
...@@ -50,7 +50,7 @@ published recently as ...@@ -50,7 +50,7 @@ published recently as
<a href="http://jlm.ipipan.waw.pl/index.php/JLM/article/view/108/140">Design and <a href="http://jlm.ipipan.waw.pl/index.php/JLM/article/view/108/140">Design and
analysis of a lean interface for Sanskrit corpus annotation</a>. analysis of a lean interface for Sanskrit corpus annotation</a>.
<p> <p>
Written on December 21st 2018, for Sanskrit Engine Version 3.11. Written on March 1st 2018, for Sanskrit Engine Version 3.13.
<h2 class="b2" id="tour">First approach to using the Sanskrit Heritage engine</h2> <h2 class="b2" id="tour">First approach to using the Sanskrit Heritage engine</h2>
...@@ -264,7 +264,7 @@ The Sanskrit Heritage Dictionary is the latest edition of a Sanskrit ...@@ -264,7 +264,7 @@ The Sanskrit Heritage Dictionary is the latest edition of a Sanskrit
to French Dictionary to French Dictionary
"Dictionnaire Français de l'Héritage Sanskrit" compiled by "Dictionnaire Français de l'Héritage Sanskrit" compiled by
Gérard Huet since 1994. This dictionary is freely available Gérard Huet since 1994. This dictionary is freely available
as a 952 pages <a href="Heritage.pdf">book</a> under the pdf format, as a 960 pages <a href="Heritage.pdf">book</a> under the pdf format,
easily readable with Acrobat Reader, a free Adobe product. easily readable with Acrobat Reader, a free Adobe product.
This dictionary is still under development, and is This dictionary is still under development, and is
automatically updated along with the site, automatically updated along with the site,
...@@ -276,7 +276,7 @@ This dictionary is the base for morphology generation used by the grammatical ...@@ -276,7 +276,7 @@ This dictionary is the base for morphology generation used by the grammatical
tools. It may be used also as a small encyclopedia of Indian culture. tools. It may be used also as a small encyclopedia of Indian culture.
The Sanskrit name that renders best our encyclopedic intention is The Sanskrit name that renders best our encyclopedic intention is
<i>saṃskṛtibhāratīyakośa</i> - <i>saṃskṛtibhāratīyakośa</i> -
Treasure of India according to Perfected tradition. Treasure of India according to refined tradition.
Knowledge in this tradition is traditionally transmitted by lineages of teachers Knowledge in this tradition is traditionally transmitted by lineages of teachers
(<i>paraṃparā</i>). Some of this knowledge is available to the West through (<i>paraṃparā</i>). Some of this knowledge is available to the West through
Indological litterature, but often in dessicated form. Many sources were used Indological litterature, but often in dessicated form. Many sources were used
...@@ -284,11 +284,11 @@ to compile this information, and inevitable mistakes and inconsistencies ...@@ -284,11 +284,11 @@ to compile this information, and inevitable mistakes and inconsistencies
occur, not to speak of glaring omissions. We pray the reader who knows occur, not to speak of glaring omissions. We pray the reader who knows
better to signal such overcomings to us. better to signal such overcomings to us.
<p> <p>
Perfected means Sanskrit or Sanskritized. Refined means Sanskrit or Sanskritized.
Thus usual names in vernacular [prak&#7771;ta] or p&#257;li are generally Thus usual names in vernacular [prak&#7771;ta] or p&#257;li are generally
given in their original Sanskrit form. Dravidian names are sometimes adapted given in their original Sanskrit form. Dravidian names are sometimes adapted
to Sanskrit as an approximate phonetic rendition, but our lexicon is too limited to Sanskrit as an approximate phonetic rendition, but our lexicon is too limited
to account for dravidian traditions, not to speak of tribal ones. to account for Dravidian traditions, not to speak of tribal ones.
In any case, this modest dictionary ought not to be considered as a In any case, this modest dictionary ought not to be considered as a
scholarly erudite document, but rather as a simplified presentation scholarly erudite document, but rather as a simplified presentation
of Indian culture for the educated public. of Indian culture for the educated public.
...@@ -958,7 +958,7 @@ button on the site control bar. ...@@ -958,7 +958,7 @@ button on the site control bar.
<a href="faq.en.html"><b>Help</b></a> | <a href="faq.en.html"><b>Help</b></a> |
<a href="portal.en.html"><b>Portal</b></a> <a href="portal.en.html"><b>Portal</b></a>
</td></tr><tr><td> </td></tr><tr><td>
&#169; G&#233;rard Huet 1994-2018</td></tr></table></td><td> &#169; G&#233;rard Huet 1994-2019</td></tr></table></td><td>
<a href="http://www.inria.fr/"> <a href="http://www.inria.fr/">
<img src="IMAGES/logo_inria.png" alt="Logo Inria" height="50"></a> <img src="IMAGES/logo_inria.png" alt="Logo Inria" height="50"></a>
<br></td></tr></table></div> <br></td></tr></table></div>
......
...@@ -5,7 +5,7 @@ ...@@ -5,7 +5,7 @@
<title>The Sanskrit Portal</title> <title>The Sanskrit Portal</title>
<meta name="author" content="G&#233;rard Huet"> <meta name="author" content="G&#233;rard Huet">
<meta property="dc:datecopyrighted" content="2018"> <meta property="dc:datecopyrighted" content="2019">
<meta property="dc:rightsholder" content="G&#233;rard Huet"> <meta property="dc:rightsholder" content="G&#233;rard Huet">
<meta name ="keywords" content="india,dictionary,indology,sanskrit,lexicography,linguistics,indo-european,dictionnaire,sanscrit,panini,indology,linguistics"> <meta name ="keywords" content="india,dictionary,indology,sanskrit,lexicography,linguistics,indo-european,dictionnaire,sanscrit,panini,indology,linguistics">
<meta name="description" content="This site provides links to Sanskrit related sites."> <meta name="description" content="This site provides links to Sanskrit related sites.">
...@@ -1110,7 +1110,7 @@ Artificial Intelligence - NASA (the famous Rick Briggs' article in AI Magazine)< ...@@ -1110,7 +1110,7 @@ Artificial Intelligence - NASA (the famous Rick Briggs' article in AI Magazine)<
Bangalore, Jan. 2010.</a><br> --> Bangalore, Jan. 2010.</a><br> -->
<p></p> <p></p>
Last update: November 20th, 2018 Last update: February 22nd, 2019
</td></tr> </td></tr>
</table> <!-- End of main contents --> </table> <!-- End of main contents -->
...@@ -1133,7 +1133,7 @@ Last update: November 20th, 2018 ...@@ -1133,7 +1133,7 @@ Last update: November 20th, 2018
<a href="faq.#LANG.html"><strong>Help</strong></a> | <a href="faq.#LANG.html"><strong>Help</strong></a> |
<a href="portal.#LANG.html"><strong>Portal</strong></a> <a href="portal.#LANG.html"><strong>Portal</strong></a>
</td></tr><tr><td> </td></tr><tr><td>
&#169; G&#233;rard Huet 1994-2018</td></tr></table></td><td> &#169; G&#233;rard Huet 1994-2019</td></tr></table></td><td>
<a href="http://www.inria.fr/"> <a href="http://www.inria.fr/">
<img src="IMAGES/logo_inria.png" alt="Logo Inria" height="50"></a> <img src="IMAGES/logo_inria.png" alt="Logo Inria" height="50"></a>
<br></td></tr></table></div> <br></td></tr></table></div>
......
...@@ -5,7 +5,7 @@ ...@@ -5,7 +5,7 @@
<title>The Sanskrit Heritage Site</title> <title>The Sanskrit Heritage Site</title>
<meta name="author" content="Gérard Huet"> <meta name="author" content="Gérard Huet">
<meta property="dc:datecopyrighted" content="2018"> <meta property="dc:datecopyrighted" content="2019">
<meta property="dc:rightsholder" content="Gérard Huet"> <meta property="dc:rightsholder" content="Gérard Huet">
<meta name ="keywords" content="india,dictionary,indology,sanskrit,lexicography,linguistics,indo-european,dictionnaire,sanscrit,panini,indology,linguistics"> <meta name ="keywords" content="india,dictionary,indology,sanskrit,lexicography,linguistics,indo-european,dictionnaire,sanscrit,panini,indology,linguistics">
<meta name="description" content="This site provides tools for Sanskrit processing: dictionary search, morphology generation and analysis, segmentation, tagging and parsing."> <meta name="description" content="This site provides tools for Sanskrit processing: dictionary search, morphology generation and analysis, segmentation, tagging and parsing.">
...@@ -490,7 +490,7 @@ Artwork credits</h2> ...@@ -490,7 +490,7 @@ Artwork credits</h2>
<a href="DICO/corpus.#LANG.html"><b>Corpus</b></a> | <a href="DICO/corpus.#LANG.html"><b>Corpus</b></a> |
<a href="faq.#LANG.html"><strong>Help</strong></a> | <a href="faq.#LANG.html"><strong>Help</strong></a> |
<a href="portal.#LANG.html"><strong>Portal</strong></a> <a href="portal.#LANG.html"><strong>Portal</strong></a>
</td></tr><tr><td>© Gérard Huet 1994-2018</td></tr></table></td><td> </td></tr><tr><td>© Gérard Huet 1994-2019</td></tr></table></td><td>
<a href="http://www.inria.fr/"> <a href="http://www.inria.fr/">
<img src="IMAGES/logo_inria.png" alt="Logo Inria" height="50"></a> <img src="IMAGES/logo_inria.png" alt="Logo Inria" height="50"></a>
<br></td></tr></table></div> <br></td></tr></table></div>
......
...@@ -5,10 +5,10 @@ ...@@ -5,10 +5,10 @@
<title>Sanskrit Linguistic Resources</title> <title>Sanskrit Linguistic Resources</title>
<meta name="author" content="Gérard Huet"> <meta name="author" content="Gérard Huet">
<meta property="dc:datecopyrighted" content="2018"> <meta property="dc:datecopyrighted" content="2019">
<meta property="dc:rightsholder" content="Gérard Huet"> <meta property="dc:rightsholder" content="Gérard Huet">
<meta name ="keywords" content="india,dictionary,indology,sanskrit,lexicography,linguistics,indo-european,dictionnaire,sanscrit,panini,indology,linguistics"> <meta name ="keywords" content="india,dictionary,indology,sanskrit,lexicography,linguistics,indo-european,dictionnaire,sanscrit,panini,indology,linguistics">
<meta name ="date" content="2018-01-08"> <meta name ="date" content="2019-03-01">
<meta name="classification" content="computational linguistics, sanskrit, morphology, lexicography, indology"> <meta name="classification" content="computational linguistics, sanskrit, morphology, lexicography, indology">
<meta name="description" content="This page is for downloading Sanskrit resources."> <meta name="description" content="This page is for downloading Sanskrit resources.">
<link rel="shortcut icon" href="IMAGES/favicon.ico"/> <link rel="shortcut icon" href="IMAGES/favicon.ico"/>
...@@ -82,7 +82,7 @@ preverb sequences, given with their sandhi analysis. ...@@ -82,7 +82,7 @@ preverb sequences, given with their sandhi analysis.
<h3 class=b2>Intellectual Property</h3> <h3 class=b2>Intellectual Property</h3>
All these linguistic data banks are Copyrighted Gérard Huet 1994-2018. All these linguistic data banks are Copyrighted Gérard Huet 1994-2019.
They are derived from the Sanskrit Heritage Dictionary They are derived from the Sanskrit Heritage Dictionary
version #VERSION dated #DATE. version #VERSION dated #DATE.
<p> <p>
...@@ -156,7 +156,7 @@ We shall not discuss this technology ...@@ -156,7 +156,7 @@ We shall not discuss this technology
further in this note on morphology, and refer the interested reader to our further in this note on morphology, and refer the interested reader to our
<a href="DICO/reader.html"><strong>Sanskrit reader <a href="DICO/reader.html"><strong>Sanskrit reader
demonstration page</strong></a> and its <a href="manual.html"> demonstration page</strong></a> and its <a href="manual.html">
<strong>Reference manual</strong></a> <strong>Reference manual</strong></a>.
<p> <p>
We remark that the respective data bases can be interrogated online by our We remark that the respective data bases can be interrogated online by our
<a href="http://sanskrit.inria.fr/DICO/index.html#stemmer"><strong>stemmer <a href="http://sanskrit.inria.fr/DICO/index.html#stemmer"><strong>stemmer
...@@ -192,7 +192,7 @@ All suggestions for improvements will be gratefully considered. ...@@ -192,7 +192,7 @@ All suggestions for improvements will be gratefully considered.
<a href="faq.en.html"><strong>Help</strong></a> | <a href="faq.en.html"><strong>Help</strong></a> |
<a href="portal.en.html"><strong>Portal</strong></a> <a href="portal.en.html"><strong>Portal</strong></a>
</td></tr> </td></tr>
<tr><td>© Gérard Huet 1994-2018</td></tr> <tr><td>© Gérard Huet 1994-2019</td></tr>
</table></td><td> </table></td><td>
<a href="http://www.inria.fr/"> <a href="http://www.inria.fr/">
<img src="IMAGES/logo_inria.png" alt="Logo Inria" height="50"></a> <img src="IMAGES/logo_inria.png" alt="Logo Inria" height="50"></a>
......
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