X-Git-Url: http://matita.cs.unibo.it/gitweb/?a=blobdiff_plain;f=helm%2FDEVEL%2Fmathml_editor%2Focaml%2Fml_mathml_editor.c;h=c74dfd01cf4b02aebe237e61dd447353389c28ec;hb=4167cea65ca58897d1a3dbb81ff95de5074700cc;hp=79594c2a8bbd566e3245c1cc515b65b0f463c7b9;hpb=387aeebf96181c051b7f527a0901b173cfcdf194;p=helm.git

diff --git a/helm/DEVEL/mathml_editor/ocaml/ml_mathml_editor.c b/helm/DEVEL/mathml_editor/ocaml/ml_mathml_editor.c
index 79594c2a8..c74dfd01c 100644
--- a/helm/DEVEL/mathml_editor/ocaml/ml_mathml_editor.c
+++ b/helm/DEVEL/mathml_editor/ocaml/ml_mathml_editor.c
@@ -1,3 +1,29 @@
+/* This file is part of EdiTeX, an editor of mathematical
+ * expressions based on TeX syntax.
+ * 
+ * Copyright (C) 2002-2003 Luca Padovani <lpadovan@cs.unibo.it>,
+ *                    2003 Paolo Marinelli <pmarinel@cs.unibo.it>.
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ *
+ * For more information, please visit the project's home page
+ * http://helm.cs.unibo.it/editex/
+ * or send an email to <lpadovan@cs.unibo.it>
+ */
+
+#include <assert.h>
 
 #include <caml/memory.h>
 #include <caml/custom.h>
@@ -16,7 +42,7 @@ typedef struct
 ml_Editor*
 Editor_val(value v)
 {
-  ml_Editor* editor = (ml_Editor*) Data_custom_val(v);
+  ml_Editor* editor = *((ml_Editor**) Data_custom_val(v));
   assert(editor != NULL);
   return editor;
 }
@@ -29,9 +55,10 @@ ml_mathml_editor_finalize(value v)
 
   remove_global_root(&editor->callback);
   c_mathml_editor_destroy(editor->c_editor);
+  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;
@@ -40,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 =
@@ -55,11 +104,13 @@ ml_mathml_editor_new(value dictionary,
     custom_deserialize_default
   };
   
-  value v = alloc_custom(&ops, sizeof(ml_Editor), 0, 1);
-  ml_Editor* ml_editor = (ml_Editor*) Data_custom_val(v);
-  ml_editor->c_editor = c_mathml_editor_new(Document_val(dictionary),
-					    Document_val(tml_mml),
-					    Document_val(tml_tex),
+  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(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;
@@ -102,6 +153,22 @@ ml_mathml_editor_drop(value v, value alt)
   CAMLreturn(Val_unit);
 }
 
+value
+ml_mathml_editor_cursor_hide(value v)
+{
+  CAMLparam1(v);
+  ml_Editor* editor = Editor_val(v);
+  CAMLreturn(Val_bool(c_mathml_editor_cursor_hide(editor->c_editor)));
+}
+
+value
+ml_mathml_editor_cursor_show(value v)
+{
+  CAMLparam1(v);
+  ml_Editor* editor = Editor_val(v);
+  CAMLreturn(Val_bool(c_mathml_editor_cursor_show(editor->c_editor)));
+}
+
 value
 ml_mathml_editor_get_tex(value v)
 {