ocaml 3.09 transition

[helm.git] / helm / DEVEL / mathml_editor / ocaml / ml_mathml_editor.c

diff --git a/helm/DEVEL/mathml_editor/ocaml/ml_mathml_editor.c b/helm/DEVEL/mathml_editor/ocaml/ml_mathml_editor.c
index 9b78aeb4101ade83155400f41882b5a43fc3c7c0..c74dfd01cf4b02aebe237e61dd447353389c28ec 100644 (file)
--- a/helm/DEVEL/mathml_editor/ocaml/ml_mathml_editor.c
+++ b/helm/DEVEL/mathml_editor/ocaml/ml_mathml_editor.c
@@ -58,7 +58,7 @@ ml_mathml_editor_finalize(value v)
   free(editor);
 }
 
-void
+static void
 ml_mathml_editor_log_callback(int level, const char* msg, void* user_data)
 {
   ml_Editor* ml_editor = (ml_Editor*) user_data;
@@ -67,9 +67,31 @@ ml_mathml_editor_log_callback(int level, const char* msg, void* user_data)
 }
 
 value
-ml_mathml_editor_new(value dictionary,
-                    value tml_mml,
-                    value tml_tex,
+ml_mathml_editor_get_default_dictionary_path(value unit)
+{
+  CAMLparam1(unit);
+  CAMLreturn(copy_string(c_mathml_editor_get_default_dictionary_path()));
+}
+
+value
+ml_mathml_editor_get_default_mathml_stylesheet_path(value unit)
+{
+  CAMLparam1(unit);
+  CAMLreturn(copy_string(c_mathml_editor_get_default_mathml_stylesheet_path()));
+}
+
+value
+ml_mathml_editor_get_default_tex_stylesheet_path(value unit)
+{
+  CAMLparam1(unit);
+  CAMLreturn(copy_string(c_mathml_editor_get_default_tex_stylesheet_path()));
+}
+
+value
+ml_mathml_editor_new(value alt,
+                    value dictionary_uri,
+                    value tml_mml_uri,
+                    value tml_tex_uri,
                     value log_message_cb)
 {
   static struct custom_operations ops =
@@ -85,9 +107,10 @@ ml_mathml_editor_new(value dictionary,
   value v = alloc_custom(&ops, sizeof(ml_Editor*), 0, 1);
   ml_Editor** ml_editor_ref = (ml_Editor**) Data_custom_val(v);
   ml_Editor* ml_editor = *ml_editor_ref = malloc(sizeof(ml_Editor));
-  ml_editor->c_editor = c_mathml_editor_new(Document_val(dictionary),
-                                           Document_val(tml_mml),
-                                           Document_val(tml_tex),
+  ml_editor->c_editor = c_mathml_editor_new(Bool_val(alt),
+                                           String_val(dictionary_uri),
+                                           String_val(tml_mml_uri),
+                                           String_val(tml_tex_uri),
                                            ml_mathml_editor_log_callback,
                                            (void*) ml_editor);
   ml_editor->callback = log_message_cb;