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

preverbs_structure moved from Xeb to Naming for cold installing bug

parent d100241d
......@@ -13,8 +13,8 @@
\begin{center}
\vspace*{24pt}
{\Large The Sanskrit Platform Documentation}\\[10pt]
{\Large (Sanskrit Library V3.07; Zen toolkit V3.1)}\\[15pt]
{\large 2018-05-26}\\[15pt]
{\Large (Sanskrit Library V3.08; Zen toolkit V3.1)}\\[15pt]
{\large 2018-06-18}\\[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.07"}~\ocwkw{and}~$\ocwlowerid{version\_date}=$\ocwstring{"2018\symbol{45}05\symbol{45}26"};\ocweol
$\ocwlowerid{value}~\ocwlowerid{version}=$\ocwstring{"3.08"}~\ocwkw{and}~$\ocwlowerid{version\_date}=$\ocwstring{"2018\symbol{45}06\symbol{45}18"};\ocweol
\ocweol
\ocwendcode{}\typeout{OcamlWeb file Date.ml}
\ocwmodule{Date}
......@@ -20226,7 +20226,7 @@ $\mid{}~[~5~::~\ocwlowerid{r2}~]~\rightarrow{}~$\ocwkw{match}~$\ocwlowerid{r2}~$
\ocwindent{8.00em}
$[~[~24~::~[~1~::~[~48~]~]~]~$\ocwbc{} saju.s \ocwec{}\ocweol
\ocwindent{10.00em}
$\rightarrow{}~\ocwlowerid{build\_us}~\ocwupperid{Mas}~\ocwlowerid{r2}~\ocwlowerid{e}~$\ocwbc{} Kale §114 \ocwec{}\ocweol
$\rightarrow{}~\ocwlowerid{build\_us}~\ocwupperid{Mas}~\ocwlowerid{r2}~\ocwlowerid{e}~$\ocwbc{} Kale§114 \ocwec{}\ocweol
\ocwindent{8.00em}
$\mid{}~\ocwlowerid{\_}~\rightarrow{}~\ocwlowerid{build\_root}~\ocwupperid{Mas}~\ocwlowerid{stem}~\ocwlowerid{e}$\ocweol
\ocwindent{8.00em}
......@@ -20540,7 +20540,7 @@ $\mid{}~[~47;~12;~34~]~$\ocwbc{} do.san \ocwec{}\ocweol
\ocwindent{7.50em}
$\mid{}~[~48;~1~]~$\ocwbc{} asan \ocwec{}\ocweol
\ocwindent{7.50em}
$\mid{}~[~48;~2~]~$\ocwbc{} aasan \ocwec{}~$\rightarrow{}~\ocwlowerid{build\_sp\_an}~\ocwlowerid{r2}~\ocwlowerid{e}~$\ocwbc{} Whitney §432 \ocwec{}\ocweol
$\mid{}~[~48;~2~]~$\ocwbc{} aasan \ocwec{}~$\rightarrow{}~\ocwlowerid{build\_sp\_an}~\ocwlowerid{r2}~\ocwlowerid{e}~$\ocwbc{} Whitney§432 \ocwec{}\ocweol
\ocwindent{7.50em}
$\mid{}~[~35;~6~]~$\ocwbc{} uudhan \ocwec{}~$\rightarrow{}~\ocwlowerid{build\_uudhan}~\ocwlowerid{r2}~\ocwlowerid{e}$\ocweol
\ocwindent{7.50em}
......@@ -20816,7 +20816,7 @@ $]$\ocweol
\ocwindent{8.50em}
\ocwkw{else}~$\ocwlowerid{build\_fem\_ii}~\ocwlowerid{r1}~\ocwlowerid{e}$\ocweol
\ocwindent{7.50em}
;~\ocwkw{match}~$\ocwlowerid{r1}~$\ocwkw{with}~\ocwbc{} vedic forms Whitney §355-356 \ocwec{}~\ocweol
;~\ocwkw{match}~$\ocwlowerid{r1}~$\ocwkw{with}~\ocwbc{} vedic forms Whitney§355-356 \ocwec{}~\ocweol
\ocwindent{8.50em}
$[~[~45;~1~]~$\ocwbc{} avii \ocwec{}\ocweol
\ocwindent{8.50em}
......@@ -20826,7 +20826,7 @@ $\mid{}~[~41;~43;~6;~48~]~$\ocwbc{} suurmii \ocwec{}~\ocweol
\ocwindent{8.50em}
$\mid{}~[~41;~47;~17;~1;~44~]~$\ocwbc{} lak.smii \ocwec{}~\ocweol
\ocwindent{8.50em}
$\mid{}~[~43;~1;~32~]~$\ocwbc{} tarii \ocwec{}~\ocwbc{} Whitney §363a \ocwec{}\ocweol
$\mid{}~[~43;~1;~32~]~$\ocwbc{} tarii \ocwec{}~\ocwbc{} Whitney§363a \ocwec{}\ocweol
\ocwindent{8.50em}
$\mid{}~[~43;~32;~36;~1;~32~]~$\ocwbc{} tantrii \ocwec{}\ocweol
\ocwindent{8.50em}
......@@ -20850,7 +20850,7 @@ $\mid{}~[~6~::~\ocwlowerid{r1}~]~$\ocwbc{} -uu \ocwec{}~$\rightarrow{}~$\ocweol
\ocwindent{7.50em}
\{~$\ocwlowerid{build\_fem\_uu}~\ocwlowerid{r1}~\ocwlowerid{e}$\ocweol
\ocwindent{7.50em}
;~\ocwkw{match}~$\ocwlowerid{r1}~$\ocwkw{with}~\ocwbc{} vedic forms Whitney §355-356 \ocwec{}\ocweol
;~\ocwkw{match}~$\ocwlowerid{r1}~$\ocwkw{with}~\ocwbc{} vedic forms Whitney§355-356 \ocwec{}\ocweol
\ocwindent{8.50em}
$[~[~35;~1;~45~]~$\ocwbc{} vadhuu \ocwec{}~\ocweol
\ocwindent{8.50em}
......@@ -21331,7 +21331,7 @@ $[~$\ocwstring{"atra"}~\ocwbc{} atrabhavat \ocwec{}\ocweol
\ocwindent{1.00em}
;~\ocwstring{"satraa"}~\ocwbc{} satraajit \ocwec{}\ocweol
\ocwindent{1.00em}
;~\ocwstring{"saha"}~\ocwbc{} problematic -- overgenerates \ocwec{}\ocweol
;~\ocwstring{"saha\#2"}~\ocwbc{} problematic -- overgenerates \ocwec{}\ocweol
\ocwindent{1.00em}
;~\ocwstring{"saak.saat"}\ocweol
\ocwindent{1.00em}
......@@ -21665,7 +21665,7 @@ $\ocwlowerid{value}~\ocwlowerid{fake\_compute\_decls}~((\ocwlowerid{s},\ocwlower
\ocwendcode{}\ocwindent{0.00em}
For Interface - cache management
\ocweol
\label{nouns.ml:181579}%
\label{nouns.ml:181574}%
\medskip
\ocwbegincode{}\ocwindent{0.00em}
\ocwkw{open}~$\ocwupperid{Bank\_lexer};~$\ocweol
......@@ -21678,7 +21678,7 @@ For Interface - cache management
\ocwindent{0.00em}
\ocwkw{open}~$\ocwupperid{Skt\_morph};$\medskip
\label{nouns.ml:181689}%
\label{nouns.ml:181684}%
\ocwindent{0.00em}
$\ocwlowerid{value}~\ocwlowerid{full\_entry}~=~\ocwupperid{Gram.Entry.}\ocwlowerid{mk}~$\ocwstring{"full\_entry"}\ocweol
\ocwindent{0.00em}
......@@ -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 *)
(**************************************************************************)
(* Module Control contains exceptions of global scope *)
......
......@@ -244,7 +244,7 @@ and voice_o v = fun
value main_preverb pvs = List2.last pvs
;
value main_preverb_string pv =
Canon.decode (main_preverb (assoc_word pv Web.preverbs_structure))
Canon.decode (main_preverb (assoc_word pv Naming.preverbs_structure))
;
value attested_verb (o_gana,o_voice) pv root = attested pv root &&
let gana = gana_o o_gana in
......
......@@ -157,6 +157,7 @@ value morpho_tags = fun
| _ -> raise (Control.Anomaly "morpho_tags")
]
;
(* Used in Lexer/Reader/Parser and Interface *)
value tags_of phase word =
match phase with
......
......@@ -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 *)
(**************************************************************************)
(* Prints morphological information, including derivative morphology.
......@@ -92,7 +92,7 @@ value print_inv_morpho pe pne pu form (seg_num,sub) generative (delta,morphs) =
;
(* Decomposes a preverb sequence into the list of its components *)
value decomp_pvs pvs =
Deco.assoc pvs Web.preverbs_structure
Deco.assoc pvs Naming.preverbs_structure
;
(* Used in [Morpho_html] *)
value print_inv_morpho_link pvs pe pne pu form =
......
......@@ -53,4 +53,13 @@ and lexical_kridantas =
and by [Morpho.print_inv_morpho] and [Morpho_ext.print_inv_morpho_ext]
at segmenting time. *)
(* Here we retrieve finer discrimination for verbs forms preceded by preverbs.
This is experimental, and incurs too many conversions betweeen strings
and words, suggesting a restructuring of preverbs representation. *)
value preverbs_structure = (* Used in Morpho for display of pvs *)
try (Gen.gobble Web.public_preverbs_file : Deco.deco Word.word)
with [ _ -> failwith "preverbs_structure" ]
;
(*i end; i*)
......@@ -8,4 +8,4 @@
(**************************************************************************)
(* Generated by make version - see main Makefile *)
value version="3.08" and version_date="2018-06-13";
value version="3.08" and version_date="2018-06-18";
......@@ -280,15 +280,6 @@ and public_sandhis_id_file = public_data "sandhis_id.rem"
and public_cache_file = public_data "cache.rem"
and public_cache_txt_file = public_data "cache.txt"
;
(* Here we retrieve finer discrimination for verbs forms preceded by preverbs.
This is experimental, and incurs too many conversions betweeen strings
and words, suggesting a restructuring of preverbs representation. *)
(* This structure is in Web which acts as a common gloabal namespace for the
various runtimes Lexer/Reader/Parser and Interface *)
value preverbs_structure = (* Used in Morpho for display of pvs *)
try (Gen.gobble public_preverbs_file : Deco.deco Word.word)
with [ _ -> failwith "preverbs_structure" ]
;
value skt_dir_url = Paths.skt_dir_url
;
(* Relative paths of top directory of site and sub directories *)
......
......@@ -35,9 +35,10 @@ XMLBANKS=$(SKTRESOURCES)XML# Heritage Sanskrit morphology in XML databases
# Path to global Sanskrit corpus downloaded from Git.
SKTCORPUS=$(SKTRESOURCES)CORPUS
# Path to the corpus in the server area.
SERVERCORPUS=$(SERVERPUBLICDIR)CORPUS
# Corpus is loaded in SERVERCORPUS at install time, by make releasecorpus
# Conversely, Corpus is exported in Resources at demand by make commit-corpus
# Macro to extract information from the Apache configuration.
apache_config_extract = $(shell apachectl -S | grep $(1) | \
......
VERSION='3.08'
DATE='2018-06-13'
DATE='2018-06-18'
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