* snapshot for gtk2

diff --git a/helm/DEVEL/mathml_editor/configure.ac b/helm/DEVEL/mathml_editor/configure.ac
index 49662e3c3646532fdbc18814e03d2b8bff79cdb4..b779c3239b1f12323292fe6ad4d667065ed13b9a 100644 (file)
--- a/helm/DEVEL/mathml_editor/configure.ac
+++ b/helm/DEVEL/mathml_editor/configure.ac
@@ -1,5 +1,5 @@
 dnl Process this file with autoconf to produce a configure script.
-AC_INIT(editex, [0.0.3])
+AC_INIT(editex, [0.0.4])
 AC_CONFIG_SRCDIR(src/TToken.hh)
 AM_INIT_AUTOMAKE($AC_PACKAGE_NAME, $AC_PACKAGE_VERSION)
 
@@ -92,15 +92,15 @@ dnl PKG_CHECK_MODULES(GLIB2, glib-2.0)
 dnl AC_SUBST(GLIB2_CFLAGS)
 dnl AC_SUBST(GLIB2_LIBS)
 
-PKG_CHECK_MODULES(GMETADOM,gdome2-cpp-smart,,AC_MSG_ERROR(can not find gmetadom))
+PKG_CHECK_MODULES(GMETADOM,gdome2-cpp-smart)
 AC_SUBST(GMETADOM_CFLAGS)
 AC_SUBST(GMETADOM_LIBS)
 
-PKG_CHECK_MODULES(GDOMEXSLT,gdome2-xslt-cpp-smart,,AC_MSG_ERROR(can not find gdome2-xslt))
+PKG_CHECK_MODULES(GDOMEXSLT,gdome2-xslt-cpp-smart)
 AC_SUBST(GDOMEXSLT_CFLAGS)
 AC_SUBST(GDOMEXSLT_LIBS)
 
-PKG_CHECK_MODULES(GTKMATHVIEW,gtkmathview,,AC_MSG_ERROR(can not find gtkmathview))
+PKG_CHECK_MODULES(GTKMATHVIEW,gtkmathview)
 AC_SUBST(GTKMATHVIEW_CFLAGS)
 AC_SUBST(GTKMATHVIEW_LIBS)
 

diff --git a/helm/DEVEL/mathml_editor/debian/libeditex-ocaml-dev.files b/helm/DEVEL/mathml_editor/debian/libeditex-ocaml-dev.files
index c0bf9c746629ecadb1a83ce896982a5be46a8f4b..debf93d04d742bff77b933492a2deee48b79d951 100644 (file)
--- a/helm/DEVEL/mathml_editor/debian/libeditex-ocaml-dev.files
+++ b/helm/DEVEL/mathml_editor/debian/libeditex-ocaml-dev.files
@@ -1,3 +1,3 @@
-usr/lib/ocaml/3.06/mathml-editor
-usr/lib/ocaml/3.06/stublibs/lib*.so
-usr/lib/ocaml/3.06/stublibs/dll*.so.owner
+usr/lib/ocaml/3.07/mathml-editor
+usr/lib/ocaml/3.07/stublibs/lib*.so
+usr/lib/ocaml/3.07/stublibs/dll*.so.owner

diff --git a/helm/DEVEL/mathml_editor/debian/libeditex-ocaml.files b/helm/DEVEL/mathml_editor/debian/libeditex-ocaml.files
index 2dd4e59d9b0d8788e22d552af715eb8ba16243dd..eba52a83741e07a796d79a3b6c3e7689970c7391 100644 (file)
--- a/helm/DEVEL/mathml_editor/debian/libeditex-ocaml.files
+++ b/helm/DEVEL/mathml_editor/debian/libeditex-ocaml.files
@@ -1 +1 @@
-usr/lib/ocaml/3.06/stublibs/dll*.so
+usr/lib/ocaml/3.07/stublibs/dll*.so

diff --git a/helm/DEVEL/mathml_editor/ocaml/Makefile.am b/helm/DEVEL/mathml_editor/ocaml/Makefile.am
index cd0b51fa2a113de75ed8f5ca584f3cb2a4460c30..6cb2ab42ce605f0837b6a920276d9203aba58a1c 100644 (file)
--- a/helm/DEVEL/mathml_editor/ocaml/Makefile.am
+++ b/helm/DEVEL/mathml_editor/ocaml/Makefile.am
@@ -70,14 +70,8 @@ $(ARCHIVE).cmxa: $(CMX_S)
        $(OCAMLMKLIB) -o $(ARCHIVE) -L@OCAMLSTUBDIR@ $(CMX_S) $(SHARED_LIBS)
 
 # use .lo for ocamlmklib
-$(DLL) $(ARCHIVE).a: $(LO_S)
-       for f in $(LO_S); do    \
-               cp $$f $$f.o;   \
-       done
-       $(OCAMLMKLIB) -o $(ARCHIVE) -L@OCAMLSTUBDIR@ $(SHARED_LIBS) $(LO_S:%=%.o)
-       for f in $(LO_S:%=%.o); do      \
-               rm $$f; \
-       done
+$(DLL) $(ARCHIVE).a: $(O_S)
+       $(OCAMLMKLIB) -o $(ARCHIVE) -L@OCAMLSTUBDIR@ $(SHARED_LIBS) $(O_S)
 
 %.cmi: %.mli
        $(OCAMLC) -c $<

diff --git a/helm/DEVEL/mathml_editor/test/editor.cc b/helm/DEVEL/mathml_editor/test/editor.cc
index 38c8bbbd0d5ebaee248d133d3c1df6ec5c9aef96..6723debb3872ca04a2bc142d51cedb8e1e7ca501 100644 (file)
--- a/helm/DEVEL/mathml_editor/test/editor.cc
+++ b/helm/DEVEL/mathml_editor/test/editor.cc
@@ -154,7 +154,7 @@ main(int argc, char* argv[])
 
   TDictionary dictionary(logger);
   logger.info("loading the dictionary...");
-  dictionary.load("/usr/share/editex/dictionary-tex.xml");
+  dictionary.load("./dict/dictionary-tex.xml");
 
   logger.info("loading the stylesheet...");
   DOM::DOMImplementation di;

diff --git a/helm/DEVEL/mathml_editor/test/guiGTK.c b/helm/DEVEL/mathml_editor/test/guiGTK.c
index 01994eaf148cce7fcd4ed8704113f7175e2dca73..cf59421cffecbdc2f92b6db7d99218e32798490d 100644 (file)
--- a/helm/DEVEL/mathml_editor/test/guiGTK.c
+++ b/helm/DEVEL/mathml_editor/test/guiGTK.c
@@ -28,7 +28,7 @@
 #include <gtk/gtk.h>
 #include <gdk/gdkkeysyms.h>
 
-#include <gtkmathview/gtkmathview.h>
+#include <gtkmathview.h>
 #include "guiGTK.h"
 
 #define XLINK_NS_URI "http://www.w3.org/1999/xlink"
@@ -50,7 +50,6 @@ static void file_open(GtkWidget*, gpointer);
 static void file_re_open(GtkWidget*, gpointer);
 static void file_close(GtkWidget*, gpointer);
 static void file_output_tex(GtkWidget*, gpointer);
-static void options_font_manager(GtkWidget*, FontManagerId);
 static void options_set_font_size(GtkWidget*, gpointer);
 static void options_change_font_size(GtkWidget*, gboolean);
 static void options_verbosity(GtkWidget*, guint);
@@ -86,9 +85,6 @@ static GtkItemFactoryEntry menu_items[] = {
   { "/Options/Default Font Size/sep1", NULL, NULL,                  0,  "<Separator>" },
   { "/Options/Default Font Size/Larger", NULL, options_change_font_size, TRUE, NULL },
   { "/Options/Default Font Size/Smaller", NULL, options_change_font_size, FALSE, NULL },
-  { "/Options/Font Manager",           NULL, NULL,                  0,  "<Branch>" },
-  { "/Options/Font Manager/_GTK",      NULL, options_font_manager,  FONT_MANAGER_GTK, "<RadioItem>" },
-  { "/Options/Font Manager/_Type 1",   NULL, options_font_manager,  FONT_MANAGER_T1, "/Options/Font Manager/GTK" },
   { "/Options/Verbosity",              NULL, NULL,                  0,  "<Branch>" },
   { "/Options/Verbosity/_Errors",      NULL, options_verbosity,     0,  "<RadioItem>" },
   { "/Options/Verbosity/_Warnings",    NULL, options_verbosity,     1,  "/Options/Verbosity/Errors" },
@@ -230,6 +226,7 @@ GUI_run()
   gtk_main();
 }
 
+#if 0
 void
 GUI_set_font_manager(FontManagerId id)
 {
@@ -260,6 +257,7 @@ GUI_set_font_manager(FontManagerId id)
 
   gtk_math_view_thaw(math_view);
 }
+#endif
 
 static void
 store_filename(GtkFileSelection* selector, GtkWidget* user_data)
@@ -313,12 +311,14 @@ file_output_tex(GtkWidget* widget, gpointer data)
   edit_output_tex(context);
 }
 
+#if 0
 static void
 options_font_manager(GtkWidget* widget, FontManagerId id)
 {
   g_return_if_fail(id != FONT_MANAGER_UNKNOWN);
   GUI_set_font_manager(id);
 }
+#endif
 
 static void
 options_anti_aliasing(GtkWidget* widget, gpointer data)

diff --git a/helm/DEVEL/mathml_editor/test/guiGTK.h b/helm/DEVEL/mathml_editor/test/guiGTK.h
index 7e3e207352c359a3e8a4ec749829167bdb03ac40..d1d68dcaae50f4dec116504d7ea2deecc1fe2fec 100644 (file)
--- a/helm/DEVEL/mathml_editor/test/guiGTK.h
+++ b/helm/DEVEL/mathml_editor/test/guiGTK.h
@@ -29,7 +29,7 @@
 #include <glib.h>
 #include <gdome.h>
 
-#include <gtkmathview/gtkmathview.h>
+#include <gtkmathview.h>
 
 #ifdef __cplusplus
 extern "C" {
@@ -50,8 +50,6 @@ extern "C" {
   void GUI_freeze(void);
   void GUI_thaw(void);
 
-  void GUI_set_font_manager(FontManagerId);
-
 #ifdef __cplusplus
 }
 #endif