From a2f9abb0b4f07678de024d4afb371ba59183edf0 Mon Sep 17 00:00:00 2001 From: Luca Padovani Date: Wed, 12 Mar 2003 10:18:02 +0000 Subject: [PATCH] * changed handling of ' (\primes) with a few patches in the stylesheets --- helm/DEVEL/mathml_editor/Makefile.am | 3 +- helm/DEVEL/mathml_editor/Makefile.in | 54 ++++++++++--------- helm/DEVEL/mathml_editor/TODO | 13 +++++ helm/DEVEL/mathml_editor/configure.ac | 20 ++++--- helm/DEVEL/mathml_editor/dictionary-tex.xml | 2 +- helm/DEVEL/mathml_editor/editex-config.in | 0 helm/DEVEL/mathml_editor/editex.pc.in | 13 +++++ .../mathml_editor/ocaml/ml_mathml_editor.c | 6 +-- helm/DEVEL/mathml_editor/src/Makefile.am | 10 +++- helm/DEVEL/mathml_editor/src/Makefile.in | 9 +++- helm/DEVEL/mathml_editor/src/TPushParser.cc | 25 ++++++--- helm/DEVEL/mathml_editor/src/TPushParser.hh | 4 +- helm/DEVEL/mathml_editor/test/Makefile.in | 3 ++ helm/DEVEL/mathml_editor/test/editor.cc | 32 +++++++---- helm/DEVEL/mathml_editor/test/guiGTK.c | 5 +- helm/DEVEL/mathml_editor/xsl/tml-mmlp.xsl | 39 ++++---------- helm/DEVEL/mathml_editor/xsl/tml-tex.xsl | 8 ++- 17 files changed, 153 insertions(+), 93 deletions(-) create mode 100644 helm/DEVEL/mathml_editor/TODO delete mode 100644 helm/DEVEL/mathml_editor/editex-config.in create mode 100644 helm/DEVEL/mathml_editor/editex.pc.in diff --git a/helm/DEVEL/mathml_editor/Makefile.am b/helm/DEVEL/mathml_editor/Makefile.am index 20f515335..63f89fc1f 100644 --- a/helm/DEVEL/mathml_editor/Makefile.am +++ b/helm/DEVEL/mathml_editor/Makefile.am @@ -2,7 +2,8 @@ SUBDIRS = src test ocaml textomml CLEANFILES = core -bin_SCRIPTS = editex-config +pkgconfigdir = $(libdir)/pkgconfig +pkgconfig_DATA = editex.pc backup: cd ..; tar cvfz @PACKAGE@-@VERSION@-`date|tr ' ' '_'|tr ':' '_'`.tar.gz @PACKAGE@ diff --git a/helm/DEVEL/mathml_editor/Makefile.in b/helm/DEVEL/mathml_editor/Makefile.in index cdb115fcd..8e9c9ef1f 100644 --- a/helm/DEVEL/mathml_editor/Makefile.in +++ b/helm/DEVEL/mathml_editor/Makefile.in @@ -72,6 +72,8 @@ EDITEX_VERSION_INFO = @EDITEX_VERSION_INFO@ EXEEXT = @EXEEXT@ GDOMEXSLT_CFLAGS = @GDOMEXSLT_CFLAGS@ GDOMEXSLT_LIBS = @GDOMEXSLT_LIBS@ +GLIB2_CFLAGS = @GLIB2_CFLAGS@ +GLIB2_LIBS = @GLIB2_LIBS@ GMETADOM_CFLAGS = @GMETADOM_CFLAGS@ GMETADOM_LIBS = @GMETADOM_LIBS@ GTKMATHVIEW_CFLAGS = @GTKMATHVIEW_CFLAGS@ @@ -97,6 +99,7 @@ OCAMLSTDLIBDIR = @OCAMLSTDLIBDIR@ OCAMLSTUBDIR = @OCAMLSTUBDIR@ OCAML_INCLUDE_DIR = @OCAML_INCLUDE_DIR@ PACKAGE = @PACKAGE@ +PKG_CONFIG = @PKG_CONFIG@ RANLIB = @RANLIB@ STRIP = @STRIP@ VERSION = @VERSION@ @@ -104,16 +107,17 @@ VERSION = @VERSION@ SUBDIRS = src test ocaml textomml CLEANFILES = core -bin_SCRIPTS = editex-config +pkgconfigdir = $(libdir)/pkgconfig +pkgconfig_DATA = editex.pc ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs CONFIG_HEADER = config.h -CONFIG_CLEAN_FILES = editex-config -SCRIPTS = $(bin_SCRIPTS) +CONFIG_CLEAN_FILES = editex.pc +DATA = $(pkgconfig_DATA) DIST_COMMON = README ./stamp-h.in AUTHORS COPYING ChangeLog INSTALL \ -Makefile.am Makefile.in NEWS aclocal.m4 config.guess config.h.in \ -config.sub configure configure.ac editex-config.in install-sh ltmain.sh \ +Makefile.am Makefile.in NEWS TODO aclocal.m4 config.guess config.h.in \ +config.sub configure configure.ac editex.pc.in install-sh ltmain.sh \ missing mkinstalldirs @@ -165,26 +169,26 @@ distclean-hdr: -rm -f config.h maintainer-clean-hdr: -editex-config: $(top_builddir)/config.status editex-config.in +editex.pc: $(top_builddir)/config.status editex.pc.in cd $(top_builddir) && CONFIG_FILES=$@ CONFIG_HEADERS= $(SHELL) ./config.status -install-binSCRIPTS: $(bin_SCRIPTS) +install-pkgconfigDATA: $(pkgconfig_DATA) @$(NORMAL_INSTALL) - $(mkinstalldirs) $(DESTDIR)$(bindir) - @list='$(bin_SCRIPTS)'; for p in $$list; do \ - if test -f $$p; then \ - echo " $(INSTALL_SCRIPT) $$p $(DESTDIR)$(bindir)/`echo $$p|sed '$(transform)'`"; \ - $(INSTALL_SCRIPT) $$p $(DESTDIR)$(bindir)/`echo $$p|sed '$(transform)'`; \ - else if test -f $(srcdir)/$$p; then \ - echo " $(INSTALL_SCRIPT) $(srcdir)/$$p $(DESTDIR)$(bindir)/`echo $$p|sed '$(transform)'`"; \ - $(INSTALL_SCRIPT) $(srcdir)/$$p $(DESTDIR)$(bindir)/`echo $$p|sed '$(transform)'`; \ - else :; fi; fi; \ + $(mkinstalldirs) $(DESTDIR)$(pkgconfigdir) + @list='$(pkgconfig_DATA)'; for p in $$list; do \ + if test -f $(srcdir)/$$p; then \ + echo " $(INSTALL_DATA) $(srcdir)/$$p $(DESTDIR)$(pkgconfigdir)/$$p"; \ + $(INSTALL_DATA) $(srcdir)/$$p $(DESTDIR)$(pkgconfigdir)/$$p; \ + else if test -f $$p; then \ + echo " $(INSTALL_DATA) $$p $(DESTDIR)$(pkgconfigdir)/$$p"; \ + $(INSTALL_DATA) $$p $(DESTDIR)$(pkgconfigdir)/$$p; \ + fi; fi; \ done -uninstall-binSCRIPTS: +uninstall-pkgconfigDATA: @$(NORMAL_UNINSTALL) - list='$(bin_SCRIPTS)'; for p in $$list; do \ - rm -f $(DESTDIR)$(bindir)/`echo $$p|sed '$(transform)'`; \ + list='$(pkgconfig_DATA)'; for p in $$list; do \ + rm -f $(DESTDIR)$(pkgconfigdir)/$$p; \ done # This directory's subdirectories are mostly independent; you can cd @@ -350,24 +354,24 @@ installcheck: installcheck-recursive all-recursive-am: config.h $(MAKE) $(AM_MAKEFLAGS) all-recursive -install-exec-am: install-binSCRIPTS +install-exec-am: install-exec: install-exec-recursive -install-data-am: +install-data-am: install-pkgconfigDATA install-data: install-data-recursive install-am: all-am @$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am install: install-recursive -uninstall-am: uninstall-binSCRIPTS +uninstall-am: uninstall-pkgconfigDATA uninstall: uninstall-recursive -all-am: Makefile $(SCRIPTS) config.h +all-am: Makefile $(DATA) config.h all-redirect: all-recursive-am install-strip: $(MAKE) $(AM_MAKEFLAGS) AM_INSTALL_PROGRAM_FLAGS=-s install installdirs: installdirs-recursive installdirs-am: - $(mkinstalldirs) $(DESTDIR)$(bindir) + $(mkinstalldirs) $(DESTDIR)$(pkgconfigdir) mostlyclean-generic: @@ -403,7 +407,7 @@ maintainer-clean: maintainer-clean-recursive -rm -f config.status .PHONY: mostlyclean-hdr distclean-hdr clean-hdr maintainer-clean-hdr \ -uninstall-binSCRIPTS install-binSCRIPTS install-data-recursive \ +uninstall-pkgconfigDATA install-pkgconfigDATA install-data-recursive \ uninstall-data-recursive install-exec-recursive \ uninstall-exec-recursive installdirs-recursive uninstalldirs-recursive \ all-recursive check-recursive installcheck-recursive info-recursive \ diff --git a/helm/DEVEL/mathml_editor/TODO b/helm/DEVEL/mathml_editor/TODO new file mode 100644 index 000000000..701ec4673 --- /dev/null +++ b/helm/DEVEL/mathml_editor/TODO @@ -0,0 +1,13 @@ + +* add param node in the TML with the name of the parameter +* add space node? active node? +* add alt boolean to all deleting methods +* implement a mechanism that allows the definition of new macros +* add open-group close-group attributes in the dictionary and handle them +* implement macro completion + +BUGS +* $1\over{2}$ does not work + +* compare pure_subst/pure_diff/subst_diff performances + diff --git a/helm/DEVEL/mathml_editor/configure.ac b/helm/DEVEL/mathml_editor/configure.ac index be109d69c..2ea4dfb15 100644 --- a/helm/DEVEL/mathml_editor/configure.ac +++ b/helm/DEVEL/mathml_editor/configure.ac @@ -1,9 +1,13 @@ dnl Process this file with autoconf to produce a configure script. -AC_INIT -AC_CONFIG_SRCDIR([src/TToken.hh]) +AC_INIT(editex, [0.0.1]) +AC_CONFIG_SRCDIR(src/TToken.hh) +AM_INIT_AUTOMAKE($AC_PACKAGE_NAME, $AC_PACKAGE_VERSION) + +PACKAGE=$AC_PACKAGE_NAME +VERSION=$AC_PACKAGE_VERSION +AC_SUBST(PACKAGE) +AC_SUBST(VERSION) -PACKAGE=editex -VERSION=0.0.1 EDITEX_VERSION_INFO=`echo $VERSION | awk -F. '{ printf "%d:%d:%d", $1+$2, $3, $2 }'` AC_SUBST(EDITEX_VERSION_INFO) @@ -32,7 +36,6 @@ AC_ARG_WITH(gmetadom-prefix, ) AC_CONFIG_HEADERS([config.h]) -AM_INIT_AUTOMAKE($PACKAGE, $VERSION) AM_CONFIG_HEADER(config.h) AH_TOP([ @@ -83,6 +86,10 @@ AC_SUBST(LDFLAGS) AM_PROG_LIBTOOL +PKG_CHECK_MODULES(GLIB2, glib-2.0) +AC_SUBST(GLIB2_CFLAGS) +AC_SUBST(GLIB2_LIBS) + GMETADOM_CONFIG="gmetadom-config" GMETADOM_MIN_VERSION=0.1.0 AC_MSG_CHECKING([for GMetaDOM C++ library] >= $GMETADOM_MIN_VERSION) @@ -243,7 +250,6 @@ AC_CONFIG_FILES([ textomml/Makefile textomml/config.dirs ocaml/Makefile - editex-config + editex.pc ]) -AC_CONFIG_COMMANDS([default],[[chmod +x editex-config]],[[]]) AC_OUTPUT diff --git a/helm/DEVEL/mathml_editor/dictionary-tex.xml b/helm/DEVEL/mathml_editor/dictionary-tex.xml index 4eff38632..fa9785111 100644 --- a/helm/DEVEL/mathml_editor/dictionary-tex.xml +++ b/helm/DEVEL/mathml_editor/dictionary-tex.xml @@ -201,7 +201,7 @@ - + diff --git a/helm/DEVEL/mathml_editor/editex-config.in b/helm/DEVEL/mathml_editor/editex-config.in deleted file mode 100644 index e69de29bb..000000000 diff --git a/helm/DEVEL/mathml_editor/editex.pc.in b/helm/DEVEL/mathml_editor/editex.pc.in new file mode 100644 index 000000000..ae286c215 --- /dev/null +++ b/helm/DEVEL/mathml_editor/editex.pc.in @@ -0,0 +1,13 @@ +# This is a comment +prefix=@prefix@ +exec_prefix=@exec_prefix@ +libdir=@libdir@ +includedir=@includedir@ + +Name: EdiTeX +Description: An XML/MathML editor based on TeX/LaTeX syntax +Version: @VERSION@ +Requires: glib-2.0 +Libs: -L${libdir} -leditex +Cflags: -I${includedir}/editex + diff --git a/helm/DEVEL/mathml_editor/ocaml/ml_mathml_editor.c b/helm/DEVEL/mathml_editor/ocaml/ml_mathml_editor.c index 7dd6bd050..2da2526ef 100644 --- a/helm/DEVEL/mathml_editor/ocaml/ml_mathml_editor.c +++ b/helm/DEVEL/mathml_editor/ocaml/ml_mathml_editor.c @@ -1,16 +1,14 @@ +#include + #include #include #include -#include #include "mlgdomevalue.h" #include "c_mathml_editor.h" -#undef assert -#define assert(x) {} - typedef struct { Editor* c_editor; diff --git a/helm/DEVEL/mathml_editor/src/Makefile.am b/helm/DEVEL/mathml_editor/src/Makefile.am index 7224cad3f..4d88a334a 100644 --- a/helm/DEVEL/mathml_editor/src/Makefile.am +++ b/helm/DEVEL/mathml_editor/src/Makefile.am @@ -3,6 +3,11 @@ lib_LTLIBRARIES = libeditex.la libeditex_la_LDFLAGS = -version-info @EDITEX_VERSION_INFO@ +libeditex_la_LDADDS = \ + $(GLIB2_LIBS) \ + $(GMETADOM_LIBS) \ + $(GDOMEXSLT_LIBS) + libeditex_la_SOURCES = \ Diff.cc \ CLoggerConsole.cc \ @@ -36,5 +41,8 @@ pkginclude_HEADERS = \ TListener.hh \ dom.hh -INCLUDES = $(GMETADOM_CFLAGS) $(GDOMEXSLT_CFLAGS) +INCLUDES = \ + $(GLIB2_CFLAGS) \ + $(GMETADOM_CFLAGS) \ + $(GDOMEXSLT_CFLAGS) diff --git a/helm/DEVEL/mathml_editor/src/Makefile.in b/helm/DEVEL/mathml_editor/src/Makefile.in index 793d71451..3b01a42bd 100644 --- a/helm/DEVEL/mathml_editor/src/Makefile.in +++ b/helm/DEVEL/mathml_editor/src/Makefile.in @@ -70,6 +70,8 @@ EDITEX_VERSION_INFO = @EDITEX_VERSION_INFO@ EXEEXT = @EXEEXT@ GDOMEXSLT_CFLAGS = @GDOMEXSLT_CFLAGS@ GDOMEXSLT_LIBS = @GDOMEXSLT_LIBS@ +GLIB2_CFLAGS = @GLIB2_CFLAGS@ +GLIB2_LIBS = @GLIB2_LIBS@ GMETADOM_CFLAGS = @GMETADOM_CFLAGS@ GMETADOM_LIBS = @GMETADOM_LIBS@ GTKMATHVIEW_CFLAGS = @GTKMATHVIEW_CFLAGS@ @@ -95,6 +97,7 @@ OCAMLSTDLIBDIR = @OCAMLSTDLIBDIR@ OCAMLSTUBDIR = @OCAMLSTUBDIR@ OCAML_INCLUDE_DIR = @OCAML_INCLUDE_DIR@ PACKAGE = @PACKAGE@ +PKG_CONFIG = @PKG_CONFIG@ RANLIB = @RANLIB@ STRIP = @STRIP@ VERSION = @VERSION@ @@ -103,13 +106,17 @@ lib_LTLIBRARIES = libeditex.la libeditex_la_LDFLAGS = -version-info @EDITEX_VERSION_INFO@ +libeditex_la_LDADDS = $(GLIB2_LIBS) $(GMETADOM_LIBS) $(GDOMEXSLT_LIBS) + + libeditex_la_SOURCES = Diff.cc CLoggerConsole.cc TPushLexer.cc LPushLexer.cc APushParser.cc TPushParser.cc CMathMLFactoryXSLT.cc CMathMLFactoryXSLTDiff.cc TDictionary.cc TDocument.cc TNode.cc TTokenizer.cc pkginclude_HEADERS = Diff.hh ALogger.hh CLoggerConsole.hh APushLexer.hh APushParser.hh AMathMLFactory.hh CMathMLFactoryXSLT.hh CMathMLFactoryXSLTDiff.hh TPushLexer.hh LPushLexer.hh TPushParser.hh TTokenizer.hh TDictionary.hh TDocument.hh TNode.hh TListener.hh dom.hh -INCLUDES = $(GMETADOM_CFLAGS) $(GDOMEXSLT_CFLAGS) +INCLUDES = $(GLIB2_CFLAGS) $(GMETADOM_CFLAGS) $(GDOMEXSLT_CFLAGS) + mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs CONFIG_HEADER = ../config.h CONFIG_CLEAN_FILES = diff --git a/helm/DEVEL/mathml_editor/src/TPushParser.cc b/helm/DEVEL/mathml_editor/src/TPushParser.cc index ad439908c..4c36b0265 100644 --- a/helm/DEVEL/mathml_editor/src/TPushParser.cc +++ b/helm/DEVEL/mathml_editor/src/TPushParser.cc @@ -36,12 +36,21 @@ TPushParser::reset() if (factory) factory->documentModified(doc); } -std::string -TPushParser::PRIME() const +TNode +TPushParser::PRIME() { const TDictionary::Entry entry = dictionary.find("prime"); - if (entry.cls == TDictionary::OPERATOR) return entry.value; - else return "?"; + if (entry.cls == TDictionary::OPERATOR) + { + TNode op = doc.createO(entry.value, nextId++); + op["name"] = "prime"; + return op; + } + else + { + TNode op = doc.createO("?", nextId++); + return op; + } } bool @@ -433,7 +442,7 @@ bool TPushParser::isPrimes(const TNode& node) const { assert(node); - return node.isG() && node.last() && node.last().is("o") && node.last()["val"] == PRIME(); + return node.isG() && node.last() && node.last().is("o") && node.last()["name"] == "prime"; } bool @@ -445,14 +454,14 @@ TPushParser::do_apostrophe() { if (prev.isSp() && prev[1] && isPrimes(prev[1])) { - prev[1].append(doc.createO(PRIME(), nextId++)); + prev[1].append(PRIME()); return true; } else if (prev.isSb() && prev[0] && prev[0].isSp() && prev[0][1] && isPrimes(prev[0][1])) { - prev[0][1].append(doc.createO(PRIME(), nextId++)); + prev[0][1].append(PRIME()); return true; } else @@ -462,7 +471,7 @@ TPushParser::do_apostrophe() prev.replace(elem); elem.append(prev); elem.append(g); - g.append(doc.createO(PRIME(), nextId++)); + g.append(PRIME()); return true; } } diff --git a/helm/DEVEL/mathml_editor/src/TPushParser.hh b/helm/DEVEL/mathml_editor/src/TPushParser.hh index 04edacb63..091e25e89 100644 --- a/helm/DEVEL/mathml_editor/src/TPushParser.hh +++ b/helm/DEVEL/mathml_editor/src/TPushParser.hh @@ -31,10 +31,8 @@ public: private: void init(void); - std::string PRIME(void) const; + TNode PRIME(void); bool isPrimes(const TNode&) const; - - bool do_begin(void); bool do_end(void); diff --git a/helm/DEVEL/mathml_editor/test/Makefile.in b/helm/DEVEL/mathml_editor/test/Makefile.in index dae4241b2..819890185 100644 --- a/helm/DEVEL/mathml_editor/test/Makefile.in +++ b/helm/DEVEL/mathml_editor/test/Makefile.in @@ -70,6 +70,8 @@ EDITEX_VERSION_INFO = @EDITEX_VERSION_INFO@ EXEEXT = @EXEEXT@ GDOMEXSLT_CFLAGS = @GDOMEXSLT_CFLAGS@ GDOMEXSLT_LIBS = @GDOMEXSLT_LIBS@ +GLIB2_CFLAGS = @GLIB2_CFLAGS@ +GLIB2_LIBS = @GLIB2_LIBS@ GMETADOM_CFLAGS = @GMETADOM_CFLAGS@ GMETADOM_LIBS = @GMETADOM_LIBS@ GTKMATHVIEW_CFLAGS = @GTKMATHVIEW_CFLAGS@ @@ -95,6 +97,7 @@ OCAMLSTDLIBDIR = @OCAMLSTDLIBDIR@ OCAMLSTUBDIR = @OCAMLSTUBDIR@ OCAML_INCLUDE_DIR = @OCAML_INCLUDE_DIR@ PACKAGE = @PACKAGE@ +PKG_CONFIG = @PKG_CONFIG@ RANLIB = @RANLIB@ STRIP = @STRIP@ VERSION = @VERSION@ diff --git a/helm/DEVEL/mathml_editor/test/editor.cc b/helm/DEVEL/mathml_editor/test/editor.cc index 181dbf540..b22bd3bed 100644 --- a/helm/DEVEL/mathml_editor/test/editor.cc +++ b/helm/DEVEL/mathml_editor/test/editor.cc @@ -2,6 +2,7 @@ #include "dom.hh" #include "TPushParser.hh" #include "TPushLexer.hh" +#include "LPushLexer.hh" #include "TDictionary.hh" #include "CLoggerConsole.hh" #include "CMathMLFactoryXSLT.hh" @@ -14,18 +15,17 @@ extern void *parseMathMLFile(char *); struct Context { - Context(const std::string& s, TPushLexer& l, TPushParser& p, DOMX::XSLTStylesheet& ts) + Context(const std::string& s, APushLexer& l, TPushParser& p, DOMX::XSLTStylesheet& ts) : buffer(s), i(0), lexer(l), parser(p), texStyle(ts) { }; void send(void) { if (i < buffer.length()) lexer.push(buffer[i++]); - else lexer.push('\n'); } std::string buffer; unsigned i; - TPushLexer& lexer; + APushLexer& lexer; TPushParser& parser; DOMX::XSLTStylesheet& texStyle; }; @@ -63,16 +63,28 @@ edit_push_char(Context* context, gchar ch) GUI_thaw(); } +#include + extern "C" void edit_push_string(Context* context, const gchar* s) { assert(context != NULL); assert(s != NULL); - GUI_freeze(); - context->parser.freeze(); - for (unsigned i = 0; s[i]; i++) context->lexer.push(s[i]); - context->parser.thaw(); - GUI_thaw(); +#if 0 +// GUI_freeze(); +// context->parser.freeze(); + for (unsigned i = 0; s[i]; i++) + { + GUI_freeze(); + context->lexer.push(s[i]); + GUI_thaw(); + usleep(100000); + usleep(100000); + } +// context->parser.thaw(); +// GUI_thaw(); +#endif + context->buffer = s; } extern "C" void @@ -112,9 +124,9 @@ main(int argc, char* argv[]) DOM::Document texStyleDoc = di.createDocumentFromURI("./xsl/tml-tex.xsl"); DOMX::XSLTStylesheet texStyle(texStyleDoc); - CMathMLFactoryXSLTDiff factory(logger, mmlStyle); + CMathMLFactoryXSLT factory(logger, mmlStyle); TPushParser parser(logger, factory, dictionary); - TPushLexer lexer(logger, parser); + LPushLexer lexer(logger, parser); #if 0 lexer.push('$'); diff --git a/helm/DEVEL/mathml_editor/test/guiGTK.c b/helm/DEVEL/mathml_editor/test/guiGTK.c index 306ec67fa..74a34608b 100644 --- a/helm/DEVEL/mathml_editor/test/guiGTK.c +++ b/helm/DEVEL/mathml_editor/test/guiGTK.c @@ -137,6 +137,9 @@ load_error_msg(const char* name) g_free(msg); } +static guint edit_timeout_id; +extern void edit_timeout(gpointer); + void GUI_init(int* argc, char*** argv, char* title, guint width, guint height, gpointer c) { @@ -151,7 +154,7 @@ GUI_init(int* argc, char*** argv, char* title, guint width, guint height, gpoint gtk_widget_show(window); context = c; - /*edit_timeout_id = gtk_timeout_add(400, edit_timeout, context);*/ + /*edit_timeout_id = gtk_timeout_add(50, edit_timeout, context);*/ } void diff --git a/helm/DEVEL/mathml_editor/xsl/tml-mmlp.xsl b/helm/DEVEL/mathml_editor/xsl/tml-mmlp.xsl index 8c9b8ead1..19a88113b 100644 --- a/helm/DEVEL/mathml_editor/xsl/tml-mmlp.xsl +++ b/helm/DEVEL/mathml_editor/xsl/tml-mmlp.xsl @@ -80,7 +80,7 @@ - + @@ -100,24 +100,7 @@ - I - - - - - - - - - - - - - - - - - + I @@ -226,12 +209,9 @@ - - - - + @@ -241,9 +221,7 @@ - - - + @@ -254,9 +232,7 @@ - - - + @@ -1034,4 +1010,9 @@ + + + + + diff --git a/helm/DEVEL/mathml_editor/xsl/tml-tex.xsl b/helm/DEVEL/mathml_editor/xsl/tml-tex.xsl index a8b9878d8..b5c6fdf3c 100644 --- a/helm/DEVEL/mathml_editor/xsl/tml-tex.xsl +++ b/helm/DEVEL/mathml_editor/xsl/tml-tex.xsl @@ -45,7 +45,7 @@ \ - + {\rm } @@ -54,7 +54,9 @@ - \ + \ + + @@ -84,6 +86,8 @@ {} + {} + -- 2.39.2