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

gam pada correction for sam- also pra-mii and Pan{8,4,15}

parent 6e93e725
This diff is collapsed.
......@@ -5,7 +5,7 @@
# Gérard Huet & Pawan Goyal #
# #
############################################################################
# Makefile of Sanskrit Heritage Software 02-06-2017 Copyright INRIA 2017 #
# Makefile of Sanskrit Heritage Software 08-01-2018 Copyright INRIA 2018 #
############################################################################
# Prerequisites: Ocaml and Camlp4 preprocessor
......
......@@ -4,7 +4,7 @@
(* *)
(* Gérard Huet *)
(* *)
(* ©2017 Institut National de Recherche en Informatique et en Automatique *)
(* ©2018 Institut National de Recherche en Informatique et en Automatique *)
(**************************************************************************)
(* CGI utilities *)
......
......@@ -4,7 +4,7 @@
(* *)
(* Gérard Huet & Pawan Goyal *)
(* *)
(* ©2017 Institut National de Recherche en Informatique et en Automatique *)
(* ©2018 Institut National de Recherche en Informatique et en Automatique *)
(**************************************************************************)
(*i module Conj_infos : sig i*)
......
......@@ -4,7 +4,7 @@
(* *)
(* Gérard Huet *)
(* *)
(* ©2017 Institut National de Recherche en Informatique et en Automatique *)
(* ©2018 Institut National de Recherche en Informatique et en Automatique *)
(**************************************************************************)
(* CGI-bin conjugation for computing root conjugations. *)
......
......@@ -4,7 +4,7 @@
(* *)
(* Gérard Huet *)
(* *)
(* ©2017 Institut National de Recherche en Informatique et en Automatique *)
(* ©2018 Institut National de Recherche en Informatique et en Automatique *)
(**************************************************************************)
(* CGI-bin declension for computing declensions. *)
......@@ -63,26 +63,26 @@ value prlist_font font =
]
;
value display_title font = do
{ pl html_paragraph
; pl (table_begin (centered Mauve))
; ps tr_begin
; ps th_begin
; ps (dtitle font)
; ps th_end
; ps tr_end
; pl table_end (* Mauve *)
; pl html_paragraph
{ html_paragraph |> pl
; table_begin (centered Mauve) |> pl
; tr_begin |> ps
; th_begin |> ps
; dtitle font |> ps
; th_end |> ps
; tr_end |> ps
; table_end |> pl (* Mauve *)
; html_paragraph |> pl
}
and display_subtitle title = do
{ pl html_paragraph
; pl (table_begin (centered Deep_sky))
; ps tr_begin
; ps th_begin
; ps title
; ps th_end
; ps tr_end
; pl table_end (* Centered *)
; pl html_paragraph
{ html_paragraph |> pl
; table_begin (centered Deep_sky) |> pl
; tr_begin |> ps
; th_begin |> ps
; title |> ps
; th_end |> ps
; tr_end |> ps
; table_end |> pl (* Centered *)
; html_paragraph |> pl
}
;
value cases_of decls =
......@@ -100,32 +100,32 @@ value cases_of decls =
in List.fold_left reorg init decls (* (v,n,a,i,d,ab,g,l) *)
;
value print_ro1 caption s d p = do
{ ps tr_begin
; ps th_begin
; ps caption
; ps (xml_next "th")
; ps s
; ps (xml_next "th")
; ps d
; ps (xml_next "th")
; ps p
; ps th_end
; pl tr_end
{ tr_begin |> ps
; th_begin |> ps
; caption |> ps
; xml_next "th" |> ps
; s |> ps
; xml_next "th" |> ps
; d |> ps
; xml_next "th" |> ps
; p |> ps
; th_end |> ps
; tr_end |> ps
}
;
value print_row_font font case s d p =
let prlist = prlist_font font in do
{ ps (tr_mouse_begin (color Light_blue) (color Pale_yellow))
; ps th_begin
; ps case
; ps (xml_next "th")
; prlist s
; ps (xml_next "th")
; prlist d
; ps (xml_next "th")
; prlist p
; ps th_end
; pl tr_end
{ tr_mouse_begin (color Light_blue) (color Pale_yellow) |> ps
; th_begin |> ps
; case |> ps
; xml_next "th" |> ps
; s |> prlist
; xml_next "th" |> ps
; d |> prlist
; xml_next "th" |> ps
; p |> prlist
; th_end |> ps
; tr_end |> pl
}
;
value display_gender font gender = fun
......@@ -165,25 +165,25 @@ value display_gender font gender = fun
value display_iic font = fun
[ [] -> ()
| l -> do
{ pl html_paragraph
; ps (h3_begin C3)
; ps (compound_name font); ps " "
{ html_paragraph |> pl
; h3_begin C3 |> ps
; compound_name font |> ps; ps " "
; let print_iic w = pr_i font w in
List.iter print_iic l
; ps h3_end
; h3_end |> ps
}
]
;
value display_avy font = fun
[ [] -> ()
| l -> do
{ pl html_paragraph
; ps (h3_begin C3)
; ps (avyaya_name font); ps " "
{ html_paragraph |> pl
; h3_begin C3 |> ps
; avyaya_name font |> ps; ps " "
; let ifc_form w = [ 0 ] (* - *) @ w in
let print_iic w = pr_f font (ifc_form w) in
List.iter print_iic l
; ps h3_end
; h3_end |> ps
}
]
;
......@@ -214,15 +214,15 @@ value display_inflected font (gen_deco,pn_deco,voca_deco,iic_deco,avy_deco) =
let (mas,fem,neu,any,_,_) = Deco.fold sort_out non_vocas voca_deco
and iic = List.map fst (Deco.contents iic_deco)
and avy = List.map fst (Deco.contents avy_deco) in do
{ pl center_begin
{ center_begin |> pl
; display_gender font Mas mas
; display_gender font Fem fem
; display_gender font Neu neu
; display_gender font (Deictic Numeral) any (* arbitrary *)
; display_iic font iic
; display_avy font avy
; pl center_end
; pl html_paragraph
; center_end |> pl
; html_paragraph |> pl
}
;
(* [entry:skt] [part:string] *)
......
......@@ -4,7 +4,7 @@
(* *)
(* Gérard Huet *)
(* *)
(* ©2017 Institut National de Recherche en Informatique et en Automatique *)
(* ©2018 Institut National de Recherche en Informatique et en Automatique *)
(**************************************************************************)
(* Dispatcher: Sanskrit Engine in 53 phases automaton (plus 2 fake ones) *)
......
......@@ -4,7 +4,7 @@
(* *)
(* Gérard Huet & Pawan Goyal *)
(* *)
(* ©2017 Institut National de Recherche en Informatique et en Automatique *)
(* ©2018 Institut National de Recherche en Informatique et en Automatique *)
(**************************************************************************)
(* This segmenter is inspired from old module Segmenter, but uses a graph
......
......@@ -4,7 +4,7 @@
(* *)
(* Gérard Huet & Pawan Goyal *)
(* *)
(* ©2017 Institut National de Recherche en Informatique et en Automatique *)
(* ©2018 Institut National de Recherche en Informatique et en Automatique *)
(**************************************************************************)
(* Sanskrit Reader Summarizing interface. *)
......
......@@ -37,7 +37,7 @@ value voices_of = fun
| "k.rz" | "krand" | "krii.d" | "kru~nc#1" | "krudh#1" | "kruz" | "klam"
| "klid" | "kliz" | "kvath" | "k.sar" | "k.sal" | "k.si" | "k.sii" | "k.su"
| "k.sudh#1" | "k.subh" | "k.svi.d" | "khaad" | "khid" | "khel" | "khyaa"
| "gaj" | "gad" | "gam" | "garj" | "gard" | "gal" | "gaa#1" | "gaa#2" | "gu~nj"
| "gaj" | "gad" | "garj" | "gard" | "gal" | "gaa#1" | "gaa#2" | "gu~nj"
| "gu.n.th" | "gup" | "gumph" | "g.rdh" | "g.rr#1" | "g.rr#2" | "granth"
| "grah" | "glai" | "ghas" | "ghu.s" | "gh.r" | "gh.r.s" | "ghraa" | "cakaas"
| "ca.t" | "cand" | "cam" | "car" | "cal" | "cit#1" | "cumb" | "chur"
......@@ -75,6 +75,7 @@ value voices_of = fun
(*| "ji" Atma needed for eg vijayate paraajayate \Pan{1,3,19} *)
(*| "jyaa#1" Atma needed for jiiyate *)
(*| "kan" Atma needed for kaayamaana *)
(*| "gam" Atma needed for sa.mgacchate *)
(*| "van" Atma needed for vanute *)
(*| "mah" also Atma for pft. maamahe *)
(*| "cit#1" also Atma for pft. cikite *)
......@@ -103,7 +104,7 @@ value voices_of = fun
[ "a~nc" | "arh" | "i" | "i.s#1" | "uurj#1" | "uuh" | ".r" | ".rj"
| "ka.n.d" | "kal" | "ka.s" | "ku.t.t" | "ku.n.d" | "k.r#1" | "k.r#2"
| "kram" | "krii" | "k.san" | "k.sap#1" | "k.sal" | "k.sip" | "k.sud" | "khan"
| "garh" | "guh" | "gras" | "gha.t.t" | "cat" | "carc" | "ci"
| "gam" | "garh" | "guh" | "gras" | "gha.t.t" | "cat" | "carc" | "ci"
| "cint" | "cud" | "ce.s.t" | "cyu" | "chad#1" | "chand" | "chid#1" | "jan"
| "juu" | "j~naa#1" | "jyaa#1" | "jyut" | "ta.d" | "tan#1" | "tan#2"
| "tud#1" | "tul" | "t.rd" | "daaz#1" | "diz#1" | "dih" | "duh#1"
......@@ -236,7 +237,7 @@ value voices_of_gana g root = match g with
value voices_of_pv upasarga gana = fun (* gana only used for "tap" "i" *)
(* Paninian requirements *)
[ "zru" | ".r" | "gam" | "svar" | "vid#1" (* | "praz" *) ->
if upasarga = "sam" then Ubha else Para (* \Pan{1,3,29} *)
if upasarga = "sam" then Atma else Para (* \Pan{1,3,29} *)
(* "praz" used in Atma with aa- but also without pv in epics (MW) *)
| "car" -> if upasarga = "sam" then Ubha else Para (* \Pan{1,3,54} *)
| "viz#1" -> if upasarga = "ni" then Atma else Para (* \Pan{1,3,17} *)
......
......@@ -4,7 +4,7 @@
(* *)
(* Gérard Huet *)
(* *)
(* ©2017 Institut National de Recherche en Informatique et en Automatique *)
(* ©2018 Institut National de Recherche en Informatique et en Automatique *)
(**************************************************************************)
(* CGI-bin callback for shallow syntax analysis *)
......
......@@ -4,7 +4,7 @@
(* *)
(* Gérard Huet *)
(* *)
(* ©2017 Institut National de Recherche en Informatique et en Automatique *)
(* ©2018 Institut National de Recherche en Informatique et en Automatique *)
(**************************************************************************)
(*i module Parts = struct i*)
......
......@@ -4,7 +4,7 @@
(* *)
(* Gérard Huet *)
(* *)
(* ©2017 Institut National de Recherche en Informatique et en Automatique *)
(* ©2018 Institut National de Recherche en Informatique et en Automatique *)
(**************************************************************************)
module Phases = struct
......
......@@ -4,7 +4,7 @@
(* *)
(* Gérard Huet & Pawan Goyal *)
(* *)
(* ©2017 Institut National de Recherche en Informatique et en Automatique *)
(* ©2018 Institut National de Recherche en Informatique et en Automatique *)
(**************************************************************************)
(* CGI-bin sktreader alias Reader for segmentation, tagging and parsing.
......
......@@ -4,7 +4,7 @@
(* *)
(* Gérard Huet *)
(* *)
(* ©2017 Institut National de Recherche en Informatique et en Automatique *)
(* ©2018 Institut National de Recherche en Informatique et en Automatique *)
(**************************************************************************)
(* The Sanskrit lexical processor *)
......
......@@ -4,7 +4,7 @@
(* *)
(* Gérard Huet *)
(* *)
(* ©2017 Institut National de Recherche en Informatique et en Automatique *)
(* ©2018 Institut National de Recherche en Informatique et en Automatique *)
(**************************************************************************)
(* A simple lexer recognizing idents, integers, punctuation symbols,
......
......@@ -8,4 +8,4 @@
(**************************************************************************)
(* Generated by make version - see main Makefile *)
value version="3.04" and version_date="2018-01-08";
value version="3.04" and version_date="2018-01-10";
......@@ -715,8 +715,7 @@ value error_page title_str msg submsg =
on the corpus is available only in [expected_mode] and not in
[current_mode]. *)
value invalid_corpus_permission_page expected current =
error_page "Corpus Manager"
"Invalid permission "
error_page "Corpus Manager" "Invalid permission "
("Expected permission: " ^ expected ^ " | Current permission: " ^ current)
;
......
VERSION='3.04'
DATE='2018-01-08'
DATE='2018-01-10'
......@@ -5,7 +5,7 @@
<title>The Sanskrit Heritage Site FAQ</title>
<meta name="author" content="G&#233;rard Huet">
<meta property="dc:datecopyrighted" content="2017">
<meta property="dc:datecopyrighted" content="2018">
<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="description" content="This site provides tools for Sanskrit processing: dictionary search, morphology generation and analysis, segmentation, tagging and parsing.">
......@@ -558,7 +558,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="faq.#LANG.html"><strong>Help</strong></a> |
<a href="portal.#LANG.html"><strong>Portal</strong></a>
</td></tr><tr><td>&#169; G&#233;rard Huet 1994-2017</td></tr></table></td><td>
</td></tr><tr><td>&#169; G&#233;rard Huet 1994-2018</td></tr></table></td><td>
<a href="http://www.inria.fr/">
<img src="IMAGES/logo_inria.png" alt="Logo Inria" height="50"></a>
<br></td></tr></table></div>
......
......@@ -5,7 +5,7 @@
<title>The Sanskrit Heritage Site Gold Book</title>
<meta name="author" content="G&#233;rard Huet" />
<meta property="dc:datecopyrighted" content="2017"/>
<meta property="dc:datecopyrighted" content="2018"/>
<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="description" content="This site provides tools for Sanskrit processing: dictionary search, morphology generation and analysis, segmentation, tagging and parsing." />
......@@ -2561,7 +2561,7 @@ Guy Fontaine<br />
<a href="faq.fr.html"><b>Help</b></a> |
<a href="portal.fr.html"><b>Portal</b></a>
</td></tr><tr><td>
&#169; G&#233;rard Huet 1994-2017</td></tr></table></td><td>
&#169; G&#233;rard Huet 1994-2018</td></tr></table></td><td>
<a href="http://www.inria.fr/">
<img src="IMAGES/logo_inria.png" alt="Logo Inria" height="50px" /></a>
<br /></td></tr></table></div>
......
......@@ -5,7 +5,7 @@
<title>The Sanskrit Heritage Engine Reference Manual</title>
<meta name="author" content="G&#233;rard Huet">
<meta property="dc:datecopyrighted" content="2017">
<meta property="dc:datecopyrighted" content="2018">
<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="description" content="This is an online manual to the Sanskrit
......@@ -50,7 +50,7 @@ published recently as
<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>.
<p>
Written on June 20th 2017, for Sanskrit Engine Version 3.00.
Written on January 8th 2018, for Sanskrit Engine Version 3.04.
<h2 class="b2" id="tour">First approach to using the Sanskrit Heritage engine</h2>
......@@ -945,7 +945,7 @@ button on the site control bar.
<a href="faq.en.html"><b>Help</b></a> |
<a href="portal.en.html"><b>Portal</b></a>
</td></tr><tr><td>
&#169; G&#233;rard Huet 1994-2017</td></tr></table></td><td>
&#169; G&#233;rard Huet 1994-2018</td></tr></table></td><td>
<a href="http://www.inria.fr/">
<img src="IMAGES/logo_inria.png" alt="Logo Inria" height="50"></a>
<br></td></tr></table></div>
......
......@@ -5,7 +5,7 @@
<title>The Sanskrit Portal</title>
<meta name="author" content="G&#233;rard Huet">
<meta property="dc:datecopyrighted" content="2017">
<meta property="dc:datecopyrighted" content="2018">
<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="description" content="This site provides links to Sanskrit related sites.">
......@@ -1069,7 +1069,7 @@ Artificial Intelligence - NASA (the famous Rick Briggs' article in AI Magazine)<
Bangalore, Jan. 2010.</a><br> -->
<p></p>
Last update: June 13th, 2017
Last update: January 8th, 2018
</td></tr>
</table> <!-- End of main contents -->
......@@ -1092,7 +1092,7 @@ Last update: June 13th, 2017
<a href="faq.#LANG.html"><strong>Help</strong></a> |
<a href="portal.#LANG.html"><strong>Portal</strong></a>
</td></tr><tr><td>
&#169; G&#233;rard Huet 1994-2017</td></tr></table></td><td>
&#169; G&#233;rard Huet 1994-2018</td></tr></table></td><td>
<a href="http://www.inria.fr/">
<img src="IMAGES/logo_inria.png" alt="Logo Inria" height="50"></a>
<br></td></tr></table></div>
......
......@@ -5,7 +5,7 @@
<title>The Sanskrit Heritage Site</title>
<meta name="author" content="Gérard Huet">
<meta property="dc:datecopyrighted" content="2017">
<meta property="dc:datecopyrighted" content="2018">
<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="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>
<a href="DICO/corpus.#LANG.html"><b>Corpus</b></a> |
<a href="faq.#LANG.html"><strong>Help</strong></a> |
<a href="portal.#LANG.html"><strong>Portal</strong></a>
</td></tr><tr><td>© Gérard Huet 1994-2017</td></tr></table></td><td>
</td></tr><tr><td>© Gérard Huet 1994-2018</td></tr></table></td><td>
<a href="http://www.inria.fr/">
<img src="IMAGES/logo_inria.png" alt="Logo Inria" height="50"></a>
<br></td></tr></table></div>
......
......@@ -5,10 +5,10 @@
<title>Sanskrit Linguistic Resources</title>
<meta name="author" content="Gérard Huet">
<meta property="dc:datecopyrighted" content="2017">
<meta property="dc:datecopyrighted" content="2018">
<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 ="date" content="2017-05-18">
<meta name ="date" content="2018-01-08">
<meta name="classification" content="computational linguistics, sanskrit, morphology, lexicography, indology">
<meta name="description" content="This page is for downloading Sanskrit resources.">
<link rel="shortcut icon" href="IMAGES/favicon.ico"/>
......@@ -82,7 +82,7 @@ preverb sequences, given with their sandhi analysis.
<h3 class=b2>Intellectual Property</h3>
All these linguistic data banks are Copyrighted Gérard Huet 1994-2017.
All these linguistic data banks are Copyrighted Gérard Huet 1994-2018.
They are derived from the Sanskrit Heritage Dictionary
version #VERSION dated #DATE.
<p>
......@@ -192,7 +192,7 @@ All suggestions for improvements will be gratefully considered.
<a href="faq.en.html"><strong>Help</strong></a> |
<a href="portal.en.html"><strong>Portal</strong></a>
</td></tr>
<tr><td>© Gérard Huet 1994-2017</td></tr>
<tr><td>© Gérard Huet 1994-2018</td></tr>
</table></td><td>
<a href="http://www.inria.fr/">
<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