Commit 5fe67064 authored by Gérard Huet's avatar Gérard Huet

dico update

parent 8f9f08cc
......@@ -109,6 +109,7 @@ value index_engine () = do
let env = create_env query in
let translit = get "t" env Paths.default_transliteration
and lex = get "lex" env Paths.default_lexicon (* default by config *)
and font = get "font" env Paths.default_display_font
and url_encoded_entry = get "q" env "" in
let lang = language_of lex in do
{ print_title_solid Mauve (Some lang) (dico_title lang)
......@@ -147,7 +148,7 @@ value index_engine () = do
; try_declensions word last
}
]
}
}
| _ -> failwith "Unknown lexicon"
]
; ps div_end (* Latin12 *)
......
......@@ -15,11 +15,20 @@
open Html;
open Web; (* ps pl abort etc. *)
value deva = (Paths.default_display_font="deva")
;
value print_query lang cgi = do
{ pl (cgi_begin cgi "convert")
; print_lexicon_select (lexicon_of lang)
; pl html_break
; pl (text_input "focus" "q")
(*[ ; ps "Output font for inflexion tool"
; pl (hidden_input "font" Paths.default_display_font)
; pl (option_select_default "font"
[ (" Roman","roma",not deva) (* default roma - Computer *)
; (" Devanagari","deva",deva) (* default deva - Simputer *)
])
; pl html_break ] TODO: switch to specific version of dictionaries *)
; pl (text_input "focus" "q")
; print_transliteration_switch "trans"
; pl html_break
; pl (submit_input "Search")
......
......@@ -5382,7 +5382,7 @@ value compute_conjugs_stems entry (vmorph,aa) = do
match entry with
[ "ifg" | "paz" | "cint" (* d.rz cit *)
| "bruu" (* vac *)
| "cud" | "pat#2" |"praa#1" | "vidh#1" | "zlath"
| "cud" | "dhii#1" | "pat#2" |"praa#1" | "vidh#1" | "zlath"
-> () (* no future *)
| "tud#1" | "cakaas" -> () (* only periphrastic *)
| "bharts" -> compute_future_gen rstem entry (* exception gana 10 *)
......@@ -5401,7 +5401,7 @@ value compute_conjugs_stems entry (vmorph,aa) = do
if gana=10 then () (* see [process10] above *)
else match entry with
[ "ifg" | "paz" (* d.rz *) | "bruu" (* vac *)
| "cud" | "pat#2" | "praa#1" | "vidh#1"
| "cud" | "dhii#1" | "pat#2" | "praa#1" | "vidh#1"
| "haa#2" -> () (* no perif *)
| "saa#1" -> do { compute_perif (revcode "si") entry
; compute_perif rstem entry
......@@ -5461,8 +5461,9 @@ value compute_conjugs_stems entry (vmorph,aa) = do
if gana=10 then () (* use periphrastic perfect *)
else match entry with
[ "paz" (* d.rz *) | "bruu" (* vac *) | "ma.mh" (* mah *)
| "ind" | "indh" | "inv" | "cakaas" | "vidh#1" -> () (* no perfect *)
| _ -> compute_perfect entry
| "ind" | "indh" | "inv" | "cakaas" | "dhii#1" | "vidh#1" -> ()
(* no perfect *)
| _ -> compute_perfect entry
]
; (* Periphrastic Perfect *) (* on demand - except gana 10 above *)
try let stem = peri_perf entry in
......
......@@ -8,4 +8,4 @@
(**************************************************************************)
(* Generated by make version - see main Makefile *)
value version="2.99" and version_date="2017-05-24";
value version="2.99" and version_date="2017-05-26";
VERSION='2.99'
DATE='2017-05-24'
DATE='2017-05-26'
......@@ -84,7 +84,7 @@ preverb sequences, given with their sandhi analysis.
All these linguistic data banks are Copyrighted Gérard Huet 1994-2017.
They are derived from the Sanskrit Heritage Dictionary
version 2.99 dated 2017-05-24.
version 2.99 dated 2017-05-26.
<p>
Use of these linguistic resources is granted according to the
Lesser General Public Licence for Linguistic Resources.
......
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