GNOME.org
 

[lasem/dom] WIP: dom, svg and mathml source split.

commit c2138168cc206a9f732bf9cf50d056323c3235ca
Author: Emmanuel Pacaud <emmanuel gnome org>
Date:   Fri Aug 19 10:31:39 2011 +0200

    WIP: dom, svg and mathml source split.

 Makefile.am                                      |    2 +-
 configure.ac                                     |    2 +-
 dom/Makefile.am                                  |  120 ++++++++++++++++++++++
 {src => dom}/lasemrender.c                       |   15 ++--
 {src => dom}/lsm.c                               |    0
 {src => dom}/lsm.h                               |    0
 {src => dom}/lsmattributes.c                     |    0
 {src => dom}/lsmattributes.h                     |    0
 {src => dom}/lsmcairo.c                          |    0
 {src => dom}/lsmcairo.h                          |    0
 {src => dom}/lsmdebug.c                          |    0
 {src => dom}/lsmdebug.h                          |    0
 {src => dom}/lsmdom.h                            |    0
 {src => dom}/lsmdomcharacterdata.c               |    0
 {src => dom}/lsmdomcharacterdata.h               |    0
 {src => dom}/lsmdomdocument.c                    |    0
 {src => dom}/lsmdomdocument.h                    |    0
 {src => dom}/lsmdomdocumentfragment.c            |    0
 {src => dom}/lsmdomdocumentfragment.h            |    0
 {src => dom}/lsmdomelement.c                     |    0
 {src => dom}/lsmdomelement.h                     |    0
 {src => dom}/lsmdomenumtypes.c.template          |    0
 {src => dom}/lsmdomenumtypes.h.template          |    0
 {src => dom}/lsmdomimplementation.c              |    8 +-
 {src => dom}/lsmdomimplementation.h              |    0
 {src => dom}/lsmdomnamednodemap.c                |    0
 {src => dom}/lsmdomnamednodemap.h                |    0
 {src => dom}/lsmdomnode.c                        |    0
 {src => dom}/lsmdomnode.h                        |    0
 {src => dom}/lsmdomnodelist.c                    |    0
 {src => dom}/lsmdomnodelist.h                    |    0
 {src => dom}/lsmdomparser.c                      |   32 +++---
 {src => dom}/lsmdomparser.h                      |    0
 {src => dom}/lsmdomtext.c                        |    0
 {src => dom}/lsmdomtext.h                        |    0
 {src => dom}/lsmdomtypes.h                       |    0
 {src => dom}/lsmdomview.c                        |    0
 {src => dom}/lsmdomview.h                        |    0
 {src => dom}/lsmproperties.c                     |    0
 {src => dom}/lsmproperties.h                     |    0
 {src => dom}/lsmstr.c                            |    0
 {src => dom}/lsmstr.h                            |    0
 {src => dom}/lsmtraits.c                         |    0
 {src => dom}/lsmtraits.h                         |    0
 {src => dom}/lsmtypes.h                          |    0
 {src => mathml}/Makefile.am                      |    0
 {src => mathml}/lsmmathml.h                      |    0
 {src => mathml}/lsmmathmlactionelement.c         |    0
 {src => mathml}/lsmmathmlactionelement.h         |    0
 {src => mathml}/lsmmathmlaligngroupelement.c     |    0
 {src => mathml}/lsmmathmlaligngroupelement.h     |    0
 {src => mathml}/lsmmathmlalignmarkelement.c      |    0
 {src => mathml}/lsmmathmlalignmarkelement.h      |    0
 {src => mathml}/lsmmathmlattributes.c            |    0
 {src => mathml}/lsmmathmlattributes.h            |    0
 {src => mathml}/lsmmathmldocument.c              |    0
 {src => mathml}/lsmmathmldocument.h              |    0
 {src => mathml}/lsmmathmlelement.c               |    0
 {src => mathml}/lsmmathmlelement.h               |    0
 {src => mathml}/lsmmathmlentitydictionary.c      |    0
 {src => mathml}/lsmmathmlentitydictionary.h      |    0
 {src => mathml}/lsmmathmlenums.c                 |    0
 {src => mathml}/lsmmathmlenums.h                 |    0
 {src => mathml}/lsmmathmlenumtypes.c.template    |    0
 {src => mathml}/lsmmathmlenumtypes.h.template    |    0
 {src => mathml}/lsmmathmlerrorelement.c          |    0
 {src => mathml}/lsmmathmlerrorelement.h          |    0
 {src => mathml}/lsmmathmlfencedelement.c         |    0
 {src => mathml}/lsmmathmlfencedelement.h         |    0
 {src => mathml}/lsmmathmlfractionelement.c       |    0
 {src => mathml}/lsmmathmlfractionelement.h       |    0
 {src => mathml}/lsmmathmlglyphtableams.c         |    0
 {src => mathml}/lsmmathmlglyphtableams.h         |    0
 {src => mathml}/lsmmathmlitexelement.c           |    0
 {src => mathml}/lsmmathmlitexelement.h           |    0
 {src => mathml}/lsmmathmllayoututils.c           |    0
 {src => mathml}/lsmmathmllayoututils.h           |    0
 {src => mathml}/lsmmathmlmathelement.c           |    0
 {src => mathml}/lsmmathmlmathelement.h           |    0
 {src => mathml}/lsmmathmloperatordictionary.c    |    0
 {src => mathml}/lsmmathmloperatordictionary.h    |    0
 {src => mathml}/lsmmathmloperatorelement.c       |    0
 {src => mathml}/lsmmathmloperatorelement.h       |    0
 {src => mathml}/lsmmathmlpaddedelement.c         |    0
 {src => mathml}/lsmmathmlpaddedelement.h         |    0
 {src => mathml}/lsmmathmlphantomelement.c        |    0
 {src => mathml}/lsmmathmlphantomelement.h        |    0
 {src => mathml}/lsmmathmlpresentationcontainer.c |    0
 {src => mathml}/lsmmathmlpresentationcontainer.h |    0
 {src => mathml}/lsmmathmlpresentationtoken.c     |    0
 {src => mathml}/lsmmathmlpresentationtoken.h     |    0
 {src => mathml}/lsmmathmlradicalelement.c        |    0
 {src => mathml}/lsmmathmlradicalelement.h        |    0
 {src => mathml}/lsmmathmlrowelement.c            |    0
 {src => mathml}/lsmmathmlrowelement.h            |    0
 {src => mathml}/lsmmathmlscriptelement.c         |    0
 {src => mathml}/lsmmathmlscriptelement.h         |    0
 {src => mathml}/lsmmathmlspaceelement.c          |    0
 {src => mathml}/lsmmathmlspaceelement.h          |    0
 {src => mathml}/lsmmathmlstringelement.c         |    0
 {src => mathml}/lsmmathmlstringelement.h         |    0
 {src => mathml}/lsmmathmlstyle.c                 |    0
 {src => mathml}/lsmmathmlstyle.h                 |    0
 {src => mathml}/lsmmathmlstyleelement.c          |    0
 {src => mathml}/lsmmathmlstyleelement.h          |    0
 {src => mathml}/lsmmathmltablecellelement.c      |    0
 {src => mathml}/lsmmathmltablecellelement.h      |    0
 {src => mathml}/lsmmathmltableelement.c          |    0
 {src => mathml}/lsmmathmltableelement.h          |    0
 {src => mathml}/lsmmathmltablerowelement.c       |    0
 {src => mathml}/lsmmathmltablerowelement.h       |    0
 {src => mathml}/lsmmathmltraits.c                |    0
 {src => mathml}/lsmmathmltraits.h                |    0
 {src => mathml}/lsmmathmltypes.h                 |    0
 {src => mathml}/lsmmathmlunderoverelement.c      |    0
 {src => mathml}/lsmmathmlunderoverelement.h      |    0
 {src => mathml}/lsmmathmlutils.c                 |    0
 {src => mathml}/lsmmathmlutils.h                 |    0
 {src => mathml}/lsmmathmlview.c                  |    0
 {src => mathml}/lsmmathmlview.h                  |    0
 src/.gitignore                                   |   11 --
 {src => svg}/Makefile.am                         |    0
 {src => svg}/lsmsvg.h                            |    0
 {src => svg}/lsmsvgattributes.h                  |    0
 {src => svg}/lsmsvgcircleelement.c               |    0
 {src => svg}/lsmsvgcircleelement.h               |    0
 {src => svg}/lsmsvgclippathelement.c             |    0
 {src => svg}/lsmsvgclippathelement.h             |    0
 {src => svg}/lsmsvgcolors.c                      |    0
 {src => svg}/lsmsvgcolors.h                      |    0
 {src => svg}/lsmsvgdefselement.c                 |    0
 {src => svg}/lsmsvgdefselement.h                 |    0
 {src => svg}/lsmsvgdocument.c                    |    0
 {src => svg}/lsmsvgdocument.h                    |    0
 {src => svg}/lsmsvgelement.c                     |    0
 {src => svg}/lsmsvgelement.h                     |    0
 {src => svg}/lsmsvgellipseelement.c              |    0
 {src => svg}/lsmsvgellipseelement.h              |    0
 {src => svg}/lsmsvgenums.c                       |    0
 {src => svg}/lsmsvgenums.h                       |    0
 {src => svg}/lsmsvgenumtypes.c.template          |    0
 {src => svg}/lsmsvgenumtypes.h.template          |    0
 {src => svg}/lsmsvgfilterelement.c               |    0
 {src => svg}/lsmsvgfilterelement.h               |    0
 {src => svg}/lsmsvgfiltergaussianblur.c          |    0
 {src => svg}/lsmsvgfiltergaussianblur.h          |    0
 {src => svg}/lsmsvgfilterprimitive.c             |    0
 {src => svg}/lsmsvgfilterprimitive.h             |    0
 {src => svg}/lsmsvggelement.c                    |    0
 {src => svg}/lsmsvggelement.h                    |    0
 {src => svg}/lsmsvggradientelement.c             |    0
 {src => svg}/lsmsvggradientelement.h             |    0
 {src => svg}/lsmsvgimageelement.c                |    0
 {src => svg}/lsmsvgimageelement.h                |    0
 {src => svg}/lsmsvglength.c                      |    0
 {src => svg}/lsmsvglength.h                      |    0
 {src => svg}/lsmsvglineargradientelement.c       |    0
 {src => svg}/lsmsvglineargradientelement.h       |    0
 {src => svg}/lsmsvglineelement.c                 |    0
 {src => svg}/lsmsvglineelement.h                 |    0
 {src => svg}/lsmsvgmarkerelement.c               |    0
 {src => svg}/lsmsvgmarkerelement.h               |    0
 {src => svg}/lsmsvgmaskelement.c                 |    0
 {src => svg}/lsmsvgmaskelement.h                 |    0
 {src => svg}/lsmsvgmatrix.c                      |    0
 {src => svg}/lsmsvgmatrix.h                      |    0
 {src => svg}/lsmsvgpathelement.c                 |    0
 {src => svg}/lsmsvgpathelement.h                 |    0
 {src => svg}/lsmsvgpatternelement.c              |    0
 {src => svg}/lsmsvgpatternelement.h              |    0
 {src => svg}/lsmsvgpolygonelement.c              |    0
 {src => svg}/lsmsvgpolygonelement.h              |    0
 {src => svg}/lsmsvgpolylineelement.c             |    0
 {src => svg}/lsmsvgpolylineelement.h             |    0
 {src => svg}/lsmsvgradialgradientelement.c       |    0
 {src => svg}/lsmsvgradialgradientelement.h       |    0
 {src => svg}/lsmsvgrectelement.c                 |    0
 {src => svg}/lsmsvgrectelement.h                 |    0
 {src => svg}/lsmsvgstopelement.c                 |    0
 {src => svg}/lsmsvgstopelement.h                 |    0
 {src => svg}/lsmsvgstyle.c                       |    0
 {src => svg}/lsmsvgstyle.h                       |    0
 {src => svg}/lsmsvgsvgelement.c                  |    0
 {src => svg}/lsmsvgsvgelement.h                  |    0
 {src => svg}/lsmsvgsymbolelement.c               |    0
 {src => svg}/lsmsvgsymbolelement.h               |    0
 {src => svg}/lsmsvgtextelement.c                 |    0
 {src => svg}/lsmsvgtextelement.h                 |    0
 {src => svg}/lsmsvgtraits.c                      |    0
 {src => svg}/lsmsvgtraits.h                      |    0
 {src => svg}/lsmsvgtspanelement.c                |    0
 {src => svg}/lsmsvgtspanelement.h                |    0
 {src => svg}/lsmsvgtypes.h                       |    0
 {src => svg}/lsmsvguseelement.c                  |    0
 {src => svg}/lsmsvguseelement.h                  |    0
 {src => svg}/lsmsvgview.c                        |    0
 {src => svg}/lsmsvgview.h                        |    0
 tests/Makefile.am                                |    4 +-
 tests/lsmtest.c                                  |    3 +-
 199 files changed, 155 insertions(+), 42 deletions(-)
---
diff --git a/Makefile.am b/Makefile.am
index 23b13f6..4db53dc 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -4,7 +4,7 @@ ACLOCAL_AMFLAGS = -I m4
 
 DISTCHECK_CONFIGURE_FLAGS = --enable-introspection --enable-gtk-doc
 
-SUBDIRS = itex2mml src tests po docs
+SUBDIRS = itex2mml dom tests po docs
 
 lasemdocdir = ${prefix}/doc/lasem- LASEM_API_VERSION@
 lasemdoc_DATA = 	\
diff --git a/configure.ac b/configure.ac
index 338e69f..877ade4 100644
--- a/configure.ac
+++ b/configure.ac
@@ -54,7 +54,7 @@ AM_CONDITIONAL([BUILD_GTK_DOC], [test "x$enable_gtk_doc" = "xyes" || test ! -f "
 AC_CONFIG_FILES([
 Makefile
 itex2mml/Makefile
-src/Makefile
+dom/Makefile
 tests/Makefile
 po/Makefile.in
 docs/Makefile
diff --git a/dom/Makefile.am b/dom/Makefile.am
new file mode 100644
index 0000000..372f7a1
--- /dev/null
+++ b/dom/Makefile.am
@@ -0,0 +1,120 @@
+include $(top_srcdir)/Makefile.decl
+
+-include $(INTROSPECTION_MAKEFILE)
+  INTROSPECTION_GIRS =
+  INTROSPECTION_SCANNER_ARGS = --add-include-path=$(srcdir)
+  INTROSPECTION_COMPILER_ARGS = --includedir=$(srcdir)
+
+INCLUDES = \
+	-DPACKAGE_LOCALE_DIR=\""$(prefix)/$(DATADIRNAME)/locale"\" \
+	-DPACKAGE_SRC_DIR=\""$(srcdir)"\" \
+	-DPACKAGE_DATA_DIR=\""$(datadir)"\" $(LASEM_CFLAGS) \
+	-DG_LOG_DOMAIN=\"Lasem\"
+
+AM_CFLAGS = -Wall
+
+lib_LTLIBRARIES = liblasem-dom- LASEM_API_VERSION@.la
+
+BUILT_SOURCES = lsmdomenumtypes.h	\
+		lsmdomenumtypes.c
+
+EXTRA_DIST = lsmdomenumtypes.h.template 	\
+	     lsmdomenumtypes.c.template
+
+liblasem_dom_ LASEM_API_VERSION@_la_LIBADD = 	\
+	../itex2mml/libitex2mml.la		\
+	$(LASEM_LIBS)
+
+LASEM_DOM_SRCS =				\
+	lsm.c					\
+	lsmdebug.c				\
+	lsmstr.c				\
+	lsmtraits.c				\
+	lsmproperties.c				\
+	lsmattributes.c				\
+	lsmcairo.c				\
+	lsmdomenumtypes.c			\
+	lsmdomnode.c				\
+	lsmdomnodelist.c			\
+	lsmdomnamednodemap.c			\
+	lsmdomdocument.c			\
+	lsmdomdocumentfragment.c		\
+	lsmdomelement.c				\
+	lsmdomcharacterdata.c			\
+	lsmdomtext.c				\
+	lsmdomview.c				\
+	lsmdomparser.c				\
+	lsmdomimplementation.c
+
+LASEM_DOM_HDRS = 				\
+	lsm.h					\
+	lsmtypes.h				\
+	lsmcairo.h				\
+	lsmstr.h				\
+	lsmdebug.h				\
+	lsmtraits.h				\
+	lsmproperties.h				\
+	lsmattributes.h				\
+	lsmdom.h				\
+	lsmdomtypes.h				\
+	lsmdomnode.h				\
+	lsmdomnodelist.h			\
+	lsmdomnamednodemap.h			\
+	lsmdomdocument.h			\
+	lsmdomdocumentfragment.h		\
+	lsmdomelement.h				\
+	lsmdomcharacterdata.h			\
+	lsmdomtext.h				\
+	lsmdomview.h				\
+	lsmdomparser.h				\
+	lsmdomimplementation.h
+
+liblasem_dom_ LASEM_API_VERSION@_ladir = $(includedir)/lasem- LASEM_API_VERSION@
+
+liblasem_dom_ LASEM_API_VERSION@_la_SOURCES = $(LASEM_DOM_SRCS)
+
+liblasem_dom_ LASEM_API_VERSION@_la_HEADERS = $(LASEM_DOM_HDRS)
+liblasem_dom_ LASEM_API_VERSION@_la_HEADERS += lsmdomenumtypes.h
+
+liblasem_dom_ LASEM_API_VERSION@_la_LDFLAGS = -version-info $(LASEM_LIBTOOL_VERSION)
+
+lsmdomenumtypes.h: lsmdomenumtypes.h.template $(LASEM_DOM_HDRS) $(GLIB_MKENUMS)
+	$(AM_V_GEN) (cd $(srcdir) && $(GLIB_MKENUMS) --template lsmdomenumtypes.h.template $(LASEM_DOM_HDRS)) > $@
+
+lsmdomenumtypes.c: lsmdomenumtypes.c.template $(LASEM_DOM_HDRS) $(GLIB_MKENUMS)
+	$(AM_V_GEN) (cd $(srcdir) && $(GLIB_MKENUMS) --template lsmdomenumtypes.c.template $(LASEM_DOM_HDRS)) > $@
+
+bin_PROGRAMS = lasem-render- LASEM_API_VERSION@
+
+lasem_render_ LASEM_API_VERSION@_SOURCES = 				\
+	lasemrender.c
+
+lasem_render_ LASEM_API_VERSION@_LDFLAGS =
+
+lasem_render_ LASEM_API_VERSION@_LDADD = $(LASEM_LIBS) liblasem-dom- LASEM_API_VERSION@.la ../itex2mml/libitex2mml.la
+
+CLEANFILES = $(BUILT_SOURCES)
+
+if HAVE_INTROSPECTION
+
+introspection_files = $(liblasem_dom_ LASEM_API_VERSION@_la_SOURCES) \
+		      $(liblasem_dom_ LASEM_API_VERSION@_la_HEADERS)
+
+Lasem- LASEM_API_VERSION@.gir: $(INTROSPECTION_SCANNER)
+Lasem_0_4_gir_INCLUDES = GObject-2.0 cairo-1.0 Gio-2.0 Pango-1.0 GdkPixbuf-2.0
+Lasem_0_4_gir_SCANNERFLAGS = --strip-prefix=Lsm
+Lasem_0_4_gir_CFLAGS = $(INCLUDES)
+Lasem_0_4_gir_LIBS = liblasem-dom- LASEM_API_VERSION@.la
+Lasem_0_4_gir_FILES = $(addprefix $(srcdir)/,$(introspection_files))
+
+INTROSPECTION_GIRS += Lasem- LASEM_API_VERSION@.gir
+
+girdir = $(datadir)/gir-1.0
+dist_gir_DATA = $(INTROSPECTION_GIRS)
+
+typelibdir = $(libdir)/girepository-1.0
+typelib_DATA = $(INTROSPECTION_GIRS:.gir=.typelib)
+
+CLEANFILES += $(dist_gir_DATA) $(typelib_DATA)
+
+endif
diff --git a/src/lasemrender.c b/dom/lasemrender.c
similarity index 91%
rename from src/lasemrender.c
rename to dom/lasemrender.c
index ae55d78..64ffb6f 100644
--- a/src/lasemrender.c
+++ b/dom/lasemrender.c
@@ -23,7 +23,8 @@
 #include <stdio.h>
 #include <string.h>
 #include <lsm.h>
-#include <lsmmathml.h>
+/*#include <lsmmathml.h>*/
+#include <lsmdomparser.h>
 #include <glib.h>
 #include <glib/gi18n.h>
 #include <glib/gprintf.h>
@@ -158,12 +159,12 @@ int main(int argc, char **argv)
 		document = lsm_dom_document_new_from_url (input_filename,
 							  NULL);
 		if (document == NULL) {
-			document = LSM_DOM_DOCUMENT (lsm_mathml_document_new_from_itex_path (input_filename,
-											     NULL));
-			if (document == NULL) {
-				document = LSM_DOM_DOCUMENT (lsm_mathml_document_new_from_itex_url (input_filename,
-												    NULL));
-			}
+/*                        document = LSM_DOM_DOCUMENT (lsm_mathml_document_new_from_itex_path (input_filename,*/
+/*                                                                                             NULL));*/
+/*                        if (document == NULL) {*/
+/*                                document = LSM_DOM_DOCUMENT (lsm_mathml_document_new_from_itex_url (input_filename,*/
+/*                                                                                                    NULL));*/
+/*                        }*/
 		}
 	}
 
diff --git a/src/lsm.c b/dom/lsm.c
similarity index 100%
rename from src/lsm.c
rename to dom/lsm.c
diff --git a/src/lsm.h b/dom/lsm.h
similarity index 100%
rename from src/lsm.h
rename to dom/lsm.h
diff --git a/src/lsmattributes.c b/dom/lsmattributes.c
similarity index 100%
rename from src/lsmattributes.c
rename to dom/lsmattributes.c
diff --git a/src/lsmattributes.h b/dom/lsmattributes.h
similarity index 100%
rename from src/lsmattributes.h
rename to dom/lsmattributes.h
diff --git a/src/lsmcairo.c b/dom/lsmcairo.c
similarity index 100%
rename from src/lsmcairo.c
rename to dom/lsmcairo.c
diff --git a/src/lsmcairo.h b/dom/lsmcairo.h
similarity index 100%
rename from src/lsmcairo.h
rename to dom/lsmcairo.h
diff --git a/src/lsmdebug.c b/dom/lsmdebug.c
similarity index 100%
rename from src/lsmdebug.c
rename to dom/lsmdebug.c
diff --git a/src/lsmdebug.h b/dom/lsmdebug.h
similarity index 100%
rename from src/lsmdebug.h
rename to dom/lsmdebug.h
diff --git a/src/lsmdom.h b/dom/lsmdom.h
similarity index 100%
rename from src/lsmdom.h
rename to dom/lsmdom.h
diff --git a/src/lsmdomcharacterdata.c b/dom/lsmdomcharacterdata.c
similarity index 100%
rename from src/lsmdomcharacterdata.c
rename to dom/lsmdomcharacterdata.c
diff --git a/src/lsmdomcharacterdata.h b/dom/lsmdomcharacterdata.h
similarity index 100%
rename from src/lsmdomcharacterdata.h
rename to dom/lsmdomcharacterdata.h
diff --git a/src/lsmdomdocument.c b/dom/lsmdomdocument.c
similarity index 100%
rename from src/lsmdomdocument.c
rename to dom/lsmdomdocument.c
diff --git a/src/lsmdomdocument.h b/dom/lsmdomdocument.h
similarity index 100%
rename from src/lsmdomdocument.h
rename to dom/lsmdomdocument.h
diff --git a/src/lsmdomdocumentfragment.c b/dom/lsmdomdocumentfragment.c
similarity index 100%
rename from src/lsmdomdocumentfragment.c
rename to dom/lsmdomdocumentfragment.c
diff --git a/src/lsmdomdocumentfragment.h b/dom/lsmdomdocumentfragment.h
similarity index 100%
rename from src/lsmdomdocumentfragment.h
rename to dom/lsmdomdocumentfragment.h
diff --git a/src/lsmdomelement.c b/dom/lsmdomelement.c
similarity index 100%
rename from src/lsmdomelement.c
rename to dom/lsmdomelement.c
diff --git a/src/lsmdomelement.h b/dom/lsmdomelement.h
similarity index 100%
rename from src/lsmdomelement.h
rename to dom/lsmdomelement.h
diff --git a/src/lsmdomenumtypes.c.template b/dom/lsmdomenumtypes.c.template
similarity index 100%
rename from src/lsmdomenumtypes.c.template
rename to dom/lsmdomenumtypes.c.template
diff --git a/src/lsmdomenumtypes.h.template b/dom/lsmdomenumtypes.h.template
similarity index 100%
rename from src/lsmdomenumtypes.h.template
rename to dom/lsmdomenumtypes.h.template
diff --git a/src/lsmdomimplementation.c b/dom/lsmdomimplementation.c
similarity index 88%
rename from src/lsmdomimplementation.c
rename to dom/lsmdomimplementation.c
index d0de878..cb07d57 100644
--- a/src/lsmdomimplementation.c
+++ b/dom/lsmdomimplementation.c
@@ -22,8 +22,8 @@
  */
 
 #include <lsmdomimplementation.h>
-#include <lsmmathmldocument.h>
-#include <lsmsvgdocument.h>
+/*#include <lsmmathmldocument.h>*/
+/*#include <lsmsvgdocument.h>*/
 #include <lsmdebug.h>
 #include <string.h>
 
@@ -48,8 +48,8 @@ lsm_dom_implementation_create_document (const char *namespace_uri,
 	g_return_val_if_fail (qualified_name != NULL, NULL);
 
 	if (document_types == NULL) {
-		lsm_dom_implementation_add_create_function ("math", lsm_mathml_document_new);
-		lsm_dom_implementation_add_create_function ("svg", lsm_svg_document_new);
+/*                lsm_dom_implementation_add_create_function ("math", lsm_mathml_document_new);*/
+/*                lsm_dom_implementation_add_create_function ("svg", lsm_svg_document_new);*/
 	}
 
 	create_function = g_hash_table_lookup (document_types, qualified_name);
diff --git a/src/lsmdomimplementation.h b/dom/lsmdomimplementation.h
similarity index 100%
rename from src/lsmdomimplementation.h
rename to dom/lsmdomimplementation.h
diff --git a/src/lsmdomnamednodemap.c b/dom/lsmdomnamednodemap.c
similarity index 100%
rename from src/lsmdomnamednodemap.c
rename to dom/lsmdomnamednodemap.c
diff --git a/src/lsmdomnamednodemap.h b/dom/lsmdomnamednodemap.h
similarity index 100%
rename from src/lsmdomnamednodemap.h
rename to dom/lsmdomnamednodemap.h
diff --git a/src/lsmdomnode.c b/dom/lsmdomnode.c
similarity index 100%
rename from src/lsmdomnode.c
rename to dom/lsmdomnode.c
diff --git a/src/lsmdomnode.h b/dom/lsmdomnode.h
similarity index 100%
rename from src/lsmdomnode.h
rename to dom/lsmdomnode.h
diff --git a/src/lsmdomnodelist.c b/dom/lsmdomnodelist.c
similarity index 100%
rename from src/lsmdomnodelist.c
rename to dom/lsmdomnodelist.c
diff --git a/src/lsmdomnodelist.h b/dom/lsmdomnodelist.h
similarity index 100%
rename from src/lsmdomnodelist.h
rename to dom/lsmdomnodelist.h
diff --git a/src/lsmdomparser.c b/dom/lsmdomparser.c
similarity index 92%
rename from src/lsmdomparser.c
rename to dom/lsmdomparser.c
index 36e0631..55ebc8c 100644
--- a/src/lsmdomparser.c
+++ b/dom/lsmdomparser.c
@@ -23,9 +23,10 @@
 #include <lsmdebug.h>
 #include <lsmdomimplementation.h>
 #include <lsmdomnode.h>
-#include <lsmmathmlpresentationtoken.h>
-#include <lsmmathmlentitydictionary.h>
-#include <lsmsvgtextelement.h>
+#include <lsmdomelement.h>
+/*#include <lsmmathmlpresentationtoken.h>*/
+/*#include <lsmmathmlentitydictionary.h>*/
+/*#include <lsmsvgtextelement.h>*/
 #include <lsmstr.h>
 #include <libxml/parser.h>
 #include <gio/gio.h>
@@ -163,27 +164,28 @@ lsm_dom_parser_get_entity (void *user_data, const xmlChar *name)
 {
 	LsmDomSaxParserState *state = user_data;
 	xmlEntity *entity;
-	const char *utf8;
+/*        const char *utf8;*/
 
 	entity = g_hash_table_lookup (state->entities, name);
 	if (entity != NULL)
 		return entity;
 
-	utf8 = lsm_mathml_entity_get_utf8 ((char *) name);
-	if (utf8 != NULL) {
+	/* FIXME */
+/*        utf8 = lsm_mathml_entity_get_utf8 ((char *) name);*/
+/*        if (utf8 != NULL) {*/
 
-		entity = g_new0 (xmlEntity, 1);
+/*                entity = g_new0 (xmlEntity, 1);*/
 
-		entity->type = XML_ENTITY_DECL;
-		entity->name = (xmlChar *) xmlMemStrdup ((const char *) name);
-		entity->content = (xmlChar *) xmlMemStrdup (utf8);
-		entity->length = strlen (utf8);
-		entity->etype = XML_INTERNAL_PREDEFINED_ENTITY;
+/*                entity->type = XML_ENTITY_DECL;*/
+/*                entity->name = (xmlChar *) xmlMemStrdup ((const char *) name);*/
+/*                entity->content = (xmlChar *) xmlMemStrdup (utf8);*/
+/*                entity->length = strlen (utf8);*/
+/*                entity->etype = XML_INTERNAL_PREDEFINED_ENTITY;*/
 
-		g_hash_table_insert (state->entities, (char *) name, entity);
+/*                g_hash_table_insert (state->entities, (char *) name, entity);*/
 
-		return entity;
-	}
+/*                return entity;*/
+/*        }*/
 
 	return xmlGetPredefinedEntity(name);
 }
diff --git a/src/lsmdomparser.h b/dom/lsmdomparser.h
similarity index 100%
rename from src/lsmdomparser.h
rename to dom/lsmdomparser.h
diff --git a/src/lsmdomtext.c b/dom/lsmdomtext.c
similarity index 100%
rename from src/lsmdomtext.c
rename to dom/lsmdomtext.c
diff --git a/src/lsmdomtext.h b/dom/lsmdomtext.h
similarity index 100%
rename from src/lsmdomtext.h
rename to dom/lsmdomtext.h
diff --git a/src/lsmdomtypes.h b/dom/lsmdomtypes.h
similarity index 100%
rename from src/lsmdomtypes.h
rename to dom/lsmdomtypes.h
diff --git a/src/lsmdomview.c b/dom/lsmdomview.c
similarity index 100%
rename from src/lsmdomview.c
rename to dom/lsmdomview.c
diff --git a/src/lsmdomview.h b/dom/lsmdomview.h
similarity index 100%
rename from src/lsmdomview.h
rename to dom/lsmdomview.h
diff --git a/src/lsmproperties.c b/dom/lsmproperties.c
similarity index 100%
rename from src/lsmproperties.c
rename to dom/lsmproperties.c
diff --git a/src/lsmproperties.h b/dom/lsmproperties.h
similarity index 100%
rename from src/lsmproperties.h
rename to dom/lsmproperties.h
diff --git a/src/lsmstr.c b/dom/lsmstr.c
similarity index 100%
rename from src/lsmstr.c
rename to dom/lsmstr.c
diff --git a/src/lsmstr.h b/dom/lsmstr.h
similarity index 100%
rename from src/lsmstr.h
rename to dom/lsmstr.h
diff --git a/src/lsmtraits.c b/dom/lsmtraits.c
similarity index 100%
rename from src/lsmtraits.c
rename to dom/lsmtraits.c
diff --git a/src/lsmtraits.h b/dom/lsmtraits.h
similarity index 100%
rename from src/lsmtraits.h
rename to dom/lsmtraits.h
diff --git a/src/lsmtypes.h b/dom/lsmtypes.h
similarity index 100%
rename from src/lsmtypes.h
rename to dom/lsmtypes.h
diff --git a/src/Makefile.am b/mathml/Makefile.am
similarity index 100%
copy from src/Makefile.am
copy to mathml/Makefile.am
diff --git a/src/lsmmathml.h b/mathml/lsmmathml.h
similarity index 100%
rename from src/lsmmathml.h
rename to mathml/lsmmathml.h
diff --git a/src/lsmmathmlactionelement.c b/mathml/lsmmathmlactionelement.c
similarity index 100%
rename from src/lsmmathmlactionelement.c
rename to mathml/lsmmathmlactionelement.c
diff --git a/src/lsmmathmlactionelement.h b/mathml/lsmmathmlactionelement.h
similarity index 100%
rename from src/lsmmathmlactionelement.h
rename to mathml/lsmmathmlactionelement.h
diff --git a/src/lsmmathmlaligngroupelement.c b/mathml/lsmmathmlaligngroupelement.c
similarity index 100%
rename from src/lsmmathmlaligngroupelement.c
rename to mathml/lsmmathmlaligngroupelement.c
diff --git a/src/lsmmathmlaligngroupelement.h b/mathml/lsmmathmlaligngroupelement.h
similarity index 100%
rename from src/lsmmathmlaligngroupelement.h
rename to mathml/lsmmathmlaligngroupelement.h
diff --git a/src/lsmmathmlalignmarkelement.c b/mathml/lsmmathmlalignmarkelement.c
similarity index 100%
rename from src/lsmmathmlalignmarkelement.c
rename to mathml/lsmmathmlalignmarkelement.c
diff --git a/src/lsmmathmlalignmarkelement.h b/mathml/lsmmathmlalignmarkelement.h
similarity index 100%
rename from src/lsmmathmlalignmarkelement.h
rename to mathml/lsmmathmlalignmarkelement.h
diff --git a/src/lsmmathmlattributes.c b/mathml/lsmmathmlattributes.c
similarity index 100%
rename from src/lsmmathmlattributes.c
rename to mathml/lsmmathmlattributes.c
diff --git a/src/lsmmathmlattributes.h b/mathml/lsmmathmlattributes.h
similarity index 100%
rename from src/lsmmathmlattributes.h
rename to mathml/lsmmathmlattributes.h
diff --git a/src/lsmmathmldocument.c b/mathml/lsmmathmldocument.c
similarity index 100%
rename from src/lsmmathmldocument.c
rename to mathml/lsmmathmldocument.c
diff --git a/src/lsmmathmldocument.h b/mathml/lsmmathmldocument.h
similarity index 100%
rename from src/lsmmathmldocument.h
rename to mathml/lsmmathmldocument.h
diff --git a/src/lsmmathmlelement.c b/mathml/lsmmathmlelement.c
similarity index 100%
rename from src/lsmmathmlelement.c
rename to mathml/lsmmathmlelement.c
diff --git a/src/lsmmathmlelement.h b/mathml/lsmmathmlelement.h
similarity index 100%
rename from src/lsmmathmlelement.h
rename to mathml/lsmmathmlelement.h
diff --git a/src/lsmmathmlentitydictionary.c b/mathml/lsmmathmlentitydictionary.c
similarity index 100%
rename from src/lsmmathmlentitydictionary.c
rename to mathml/lsmmathmlentitydictionary.c
diff --git a/src/lsmmathmlentitydictionary.h b/mathml/lsmmathmlentitydictionary.h
similarity index 100%
rename from src/lsmmathmlentitydictionary.h
rename to mathml/lsmmathmlentitydictionary.h
diff --git a/src/lsmmathmlenums.c b/mathml/lsmmathmlenums.c
similarity index 100%
rename from src/lsmmathmlenums.c
rename to mathml/lsmmathmlenums.c
diff --git a/src/lsmmathmlenums.h b/mathml/lsmmathmlenums.h
similarity index 100%
rename from src/lsmmathmlenums.h
rename to mathml/lsmmathmlenums.h
diff --git a/src/lsmmathmlenumtypes.c.template b/mathml/lsmmathmlenumtypes.c.template
similarity index 100%
rename from src/lsmmathmlenumtypes.c.template
rename to mathml/lsmmathmlenumtypes.c.template
diff --git a/src/lsmmathmlenumtypes.h.template b/mathml/lsmmathmlenumtypes.h.template
similarity index 100%
rename from src/lsmmathmlenumtypes.h.template
rename to mathml/lsmmathmlenumtypes.h.template
diff --git a/src/lsmmathmlerrorelement.c b/mathml/lsmmathmlerrorelement.c
similarity index 100%
rename from src/lsmmathmlerrorelement.c
rename to mathml/lsmmathmlerrorelement.c
diff --git a/src/lsmmathmlerrorelement.h b/mathml/lsmmathmlerrorelement.h
similarity index 100%
rename from src/lsmmathmlerrorelement.h
rename to mathml/lsmmathmlerrorelement.h
diff --git a/src/lsmmathmlfencedelement.c b/mathml/lsmmathmlfencedelement.c
similarity index 100%
rename from src/lsmmathmlfencedelement.c
rename to mathml/lsmmathmlfencedelement.c
diff --git a/src/lsmmathmlfencedelement.h b/mathml/lsmmathmlfencedelement.h
similarity index 100%
rename from src/lsmmathmlfencedelement.h
rename to mathml/lsmmathmlfencedelement.h
diff --git a/src/lsmmathmlfractionelement.c b/mathml/lsmmathmlfractionelement.c
similarity index 100%
rename from src/lsmmathmlfractionelement.c
rename to mathml/lsmmathmlfractionelement.c
diff --git a/src/lsmmathmlfractionelement.h b/mathml/lsmmathmlfractionelement.h
similarity index 100%
rename from src/lsmmathmlfractionelement.h
rename to mathml/lsmmathmlfractionelement.h
diff --git a/src/lsmmathmlglyphtableams.c b/mathml/lsmmathmlglyphtableams.c
similarity index 100%
rename from src/lsmmathmlglyphtableams.c
rename to mathml/lsmmathmlglyphtableams.c
diff --git a/src/lsmmathmlglyphtableams.h b/mathml/lsmmathmlglyphtableams.h
similarity index 100%
rename from src/lsmmathmlglyphtableams.h
rename to mathml/lsmmathmlglyphtableams.h
diff --git a/src/lsmmathmlitexelement.c b/mathml/lsmmathmlitexelement.c
similarity index 100%
rename from src/lsmmathmlitexelement.c
rename to mathml/lsmmathmlitexelement.c
diff --git a/src/lsmmathmlitexelement.h b/mathml/lsmmathmlitexelement.h
similarity index 100%
rename from src/lsmmathmlitexelement.h
rename to mathml/lsmmathmlitexelement.h
diff --git a/src/lsmmathmllayoututils.c b/mathml/lsmmathmllayoututils.c
similarity index 100%
rename from src/lsmmathmllayoututils.c
rename to mathml/lsmmathmllayoututils.c
diff --git a/src/lsmmathmllayoututils.h b/mathml/lsmmathmllayoututils.h
similarity index 100%
rename from src/lsmmathmllayoututils.h
rename to mathml/lsmmathmllayoututils.h
diff --git a/src/lsmmathmlmathelement.c b/mathml/lsmmathmlmathelement.c
similarity index 100%
rename from src/lsmmathmlmathelement.c
rename to mathml/lsmmathmlmathelement.c
diff --git a/src/lsmmathmlmathelement.h b/mathml/lsmmathmlmathelement.h
similarity index 100%
rename from src/lsmmathmlmathelement.h
rename to mathml/lsmmathmlmathelement.h
diff --git a/src/lsmmathmloperatordictionary.c b/mathml/lsmmathmloperatordictionary.c
similarity index 100%
rename from src/lsmmathmloperatordictionary.c
rename to mathml/lsmmathmloperatordictionary.c
diff --git a/src/lsmmathmloperatordictionary.h b/mathml/lsmmathmloperatordictionary.h
similarity index 100%
rename from src/lsmmathmloperatordictionary.h
rename to mathml/lsmmathmloperatordictionary.h
diff --git a/src/lsmmathmloperatorelement.c b/mathml/lsmmathmloperatorelement.c
similarity index 100%
rename from src/lsmmathmloperatorelement.c
rename to mathml/lsmmathmloperatorelement.c
diff --git a/src/lsmmathmloperatorelement.h b/mathml/lsmmathmloperatorelement.h
similarity index 100%
rename from src/lsmmathmloperatorelement.h
rename to mathml/lsmmathmloperatorelement.h
diff --git a/src/lsmmathmlpaddedelement.c b/mathml/lsmmathmlpaddedelement.c
similarity index 100%
rename from src/lsmmathmlpaddedelement.c
rename to mathml/lsmmathmlpaddedelement.c
diff --git a/src/lsmmathmlpaddedelement.h b/mathml/lsmmathmlpaddedelement.h
similarity index 100%
rename from src/lsmmathmlpaddedelement.h
rename to mathml/lsmmathmlpaddedelement.h
diff --git a/src/lsmmathmlphantomelement.c b/mathml/lsmmathmlphantomelement.c
similarity index 100%
rename from src/lsmmathmlphantomelement.c
rename to mathml/lsmmathmlphantomelement.c
diff --git a/src/lsmmathmlphantomelement.h b/mathml/lsmmathmlphantomelement.h
similarity index 100%
rename from src/lsmmathmlphantomelement.h
rename to mathml/lsmmathmlphantomelement.h
diff --git a/src/lsmmathmlpresentationcontainer.c b/mathml/lsmmathmlpresentationcontainer.c
similarity index 100%
rename from src/lsmmathmlpresentationcontainer.c
rename to mathml/lsmmathmlpresentationcontainer.c
diff --git a/src/lsmmathmlpresentationcontainer.h b/mathml/lsmmathmlpresentationcontainer.h
similarity index 100%
rename from src/lsmmathmlpresentationcontainer.h
rename to mathml/lsmmathmlpresentationcontainer.h
diff --git a/src/lsmmathmlpresentationtoken.c b/mathml/lsmmathmlpresentationtoken.c
similarity index 100%
rename from src/lsmmathmlpresentationtoken.c
rename to mathml/lsmmathmlpresentationtoken.c
diff --git a/src/lsmmathmlpresentationtoken.h b/mathml/lsmmathmlpresentationtoken.h
similarity index 100%
rename from src/lsmmathmlpresentationtoken.h
rename to mathml/lsmmathmlpresentationtoken.h
diff --git a/src/lsmmathmlradicalelement.c b/mathml/lsmmathmlradicalelement.c
similarity index 100%
rename from src/lsmmathmlradicalelement.c
rename to mathml/lsmmathmlradicalelement.c
diff --git a/src/lsmmathmlradicalelement.h b/mathml/lsmmathmlradicalelement.h
similarity index 100%
rename from src/lsmmathmlradicalelement.h
rename to mathml/lsmmathmlradicalelement.h
diff --git a/src/lsmmathmlrowelement.c b/mathml/lsmmathmlrowelement.c
similarity index 100%
rename from src/lsmmathmlrowelement.c
rename to mathml/lsmmathmlrowelement.c
diff --git a/src/lsmmathmlrowelement.h b/mathml/lsmmathmlrowelement.h
similarity index 100%
rename from src/lsmmathmlrowelement.h
rename to mathml/lsmmathmlrowelement.h
diff --git a/src/lsmmathmlscriptelement.c b/mathml/lsmmathmlscriptelement.c
similarity index 100%
rename from src/lsmmathmlscriptelement.c
rename to mathml/lsmmathmlscriptelement.c
diff --git a/src/lsmmathmlscriptelement.h b/mathml/lsmmathmlscriptelement.h
similarity index 100%
rename from src/lsmmathmlscriptelement.h
rename to mathml/lsmmathmlscriptelement.h
diff --git a/src/lsmmathmlspaceelement.c b/mathml/lsmmathmlspaceelement.c
similarity index 100%
rename from src/lsmmathmlspaceelement.c
rename to mathml/lsmmathmlspaceelement.c
diff --git a/src/lsmmathmlspaceelement.h b/mathml/lsmmathmlspaceelement.h
similarity index 100%
rename from src/lsmmathmlspaceelement.h
rename to mathml/lsmmathmlspaceelement.h
diff --git a/src/lsmmathmlstringelement.c b/mathml/lsmmathmlstringelement.c
similarity index 100%
rename from src/lsmmathmlstringelement.c
rename to mathml/lsmmathmlstringelement.c
diff --git a/src/lsmmathmlstringelement.h b/mathml/lsmmathmlstringelement.h
similarity index 100%
rename from src/lsmmathmlstringelement.h
rename to mathml/lsmmathmlstringelement.h
diff --git a/src/lsmmathmlstyle.c b/mathml/lsmmathmlstyle.c
similarity index 100%
rename from src/lsmmathmlstyle.c
rename to mathml/lsmmathmlstyle.c
diff --git a/src/lsmmathmlstyle.h b/mathml/lsmmathmlstyle.h
similarity index 100%
rename from src/lsmmathmlstyle.h
rename to mathml/lsmmathmlstyle.h
diff --git a/src/lsmmathmlstyleelement.c b/mathml/lsmmathmlstyleelement.c
similarity index 100%
rename from src/lsmmathmlstyleelement.c
rename to mathml/lsmmathmlstyleelement.c
diff --git a/src/lsmmathmlstyleelement.h b/mathml/lsmmathmlstyleelement.h
similarity index 100%
rename from src/lsmmathmlstyleelement.h
rename to mathml/lsmmathmlstyleelement.h
diff --git a/src/lsmmathmltablecellelement.c b/mathml/lsmmathmltablecellelement.c
similarity index 100%
rename from src/lsmmathmltablecellelement.c
rename to mathml/lsmmathmltablecellelement.c
diff --git a/src/lsmmathmltablecellelement.h b/mathml/lsmmathmltablecellelement.h
similarity index 100%
rename from src/lsmmathmltablecellelement.h
rename to mathml/lsmmathmltablecellelement.h
diff --git a/src/lsmmathmltableelement.c b/mathml/lsmmathmltableelement.c
similarity index 100%
rename from src/lsmmathmltableelement.c
rename to mathml/lsmmathmltableelement.c
diff --git a/src/lsmmathmltableelement.h b/mathml/lsmmathmltableelement.h
similarity index 100%
rename from src/lsmmathmltableelement.h
rename to mathml/lsmmathmltableelement.h
diff --git a/src/lsmmathmltablerowelement.c b/mathml/lsmmathmltablerowelement.c
similarity index 100%
rename from src/lsmmathmltablerowelement.c
rename to mathml/lsmmathmltablerowelement.c
diff --git a/src/lsmmathmltablerowelement.h b/mathml/lsmmathmltablerowelement.h
similarity index 100%
rename from src/lsmmathmltablerowelement.h
rename to mathml/lsmmathmltablerowelement.h
diff --git a/src/lsmmathmltraits.c b/mathml/lsmmathmltraits.c
similarity index 100%
rename from src/lsmmathmltraits.c
rename to mathml/lsmmathmltraits.c
diff --git a/src/lsmmathmltraits.h b/mathml/lsmmathmltraits.h
similarity index 100%
rename from src/lsmmathmltraits.h
rename to mathml/lsmmathmltraits.h
diff --git a/src/lsmmathmltypes.h b/mathml/lsmmathmltypes.h
similarity index 100%
rename from src/lsmmathmltypes.h
rename to mathml/lsmmathmltypes.h
diff --git a/src/lsmmathmlunderoverelement.c b/mathml/lsmmathmlunderoverelement.c
similarity index 100%
rename from src/lsmmathmlunderoverelement.c
rename to mathml/lsmmathmlunderoverelement.c
diff --git a/src/lsmmathmlunderoverelement.h b/mathml/lsmmathmlunderoverelement.h
similarity index 100%
rename from src/lsmmathmlunderoverelement.h
rename to mathml/lsmmathmlunderoverelement.h
diff --git a/src/lsmmathmlutils.c b/mathml/lsmmathmlutils.c
similarity index 100%
rename from src/lsmmathmlutils.c
rename to mathml/lsmmathmlutils.c
diff --git a/src/lsmmathmlutils.h b/mathml/lsmmathmlutils.h
similarity index 100%
rename from src/lsmmathmlutils.h
rename to mathml/lsmmathmlutils.h
diff --git a/src/lsmmathmlview.c b/mathml/lsmmathmlview.c
similarity index 100%
rename from src/lsmmathmlview.c
rename to mathml/lsmmathmlview.c
diff --git a/src/lsmmathmlview.h b/mathml/lsmmathmlview.h
similarity index 100%
rename from src/lsmmathmlview.h
rename to mathml/lsmmathmlview.h
diff --git a/src/Makefile.am b/svg/Makefile.am
similarity index 100%
rename from src/Makefile.am
rename to svg/Makefile.am
diff --git a/src/lsmsvg.h b/svg/lsmsvg.h
similarity index 100%
rename from src/lsmsvg.h
rename to svg/lsmsvg.h
diff --git a/src/lsmsvgattributes.h b/svg/lsmsvgattributes.h
similarity index 100%
rename from src/lsmsvgattributes.h
rename to svg/lsmsvgattributes.h
diff --git a/src/lsmsvgcircleelement.c b/svg/lsmsvgcircleelement.c
similarity index 100%
rename from src/lsmsvgcircleelement.c
rename to svg/lsmsvgcircleelement.c
diff --git a/src/lsmsvgcircleelement.h b/svg/lsmsvgcircleelement.h
similarity index 100%
rename from src/lsmsvgcircleelement.h
rename to svg/lsmsvgcircleelement.h
diff --git a/src/lsmsvgclippathelement.c b/svg/lsmsvgclippathelement.c
similarity index 100%
rename from src/lsmsvgclippathelement.c
rename to svg/lsmsvgclippathelement.c
diff --git a/src/lsmsvgclippathelement.h b/svg/lsmsvgclippathelement.h
similarity index 100%
rename from src/lsmsvgclippathelement.h
rename to svg/lsmsvgclippathelement.h
diff --git a/src/lsmsvgcolors.c b/svg/lsmsvgcolors.c
similarity index 100%
rename from src/lsmsvgcolors.c
rename to svg/lsmsvgcolors.c
diff --git a/src/lsmsvgcolors.h b/svg/lsmsvgcolors.h
similarity index 100%
rename from src/lsmsvgcolors.h
rename to svg/lsmsvgcolors.h
diff --git a/src/lsmsvgdefselement.c b/svg/lsmsvgdefselement.c
similarity index 100%
rename from src/lsmsvgdefselement.c
rename to svg/lsmsvgdefselement.c
diff --git a/src/lsmsvgdefselement.h b/svg/lsmsvgdefselement.h
similarity index 100%
rename from src/lsmsvgdefselement.h
rename to svg/lsmsvgdefselement.h
diff --git a/src/lsmsvgdocument.c b/svg/lsmsvgdocument.c
similarity index 100%
rename from src/lsmsvgdocument.c
rename to svg/lsmsvgdocument.c
diff --git a/src/lsmsvgdocument.h b/svg/lsmsvgdocument.h
similarity index 100%
rename from src/lsmsvgdocument.h
rename to svg/lsmsvgdocument.h
diff --git a/src/lsmsvgelement.c b/svg/lsmsvgelement.c
similarity index 100%
rename from src/lsmsvgelement.c
rename to svg/lsmsvgelement.c
diff --git a/src/lsmsvgelement.h b/svg/lsmsvgelement.h
similarity index 100%
rename from src/lsmsvgelement.h
rename to svg/lsmsvgelement.h
diff --git a/src/lsmsvgellipseelement.c b/svg/lsmsvgellipseelement.c
similarity index 100%
rename from src/lsmsvgellipseelement.c
rename to svg/lsmsvgellipseelement.c
diff --git a/src/lsmsvgellipseelement.h b/svg/lsmsvgellipseelement.h
similarity index 100%
rename from src/lsmsvgellipseelement.h
rename to svg/lsmsvgellipseelement.h
diff --git a/src/lsmsvgenums.c b/svg/lsmsvgenums.c
similarity index 100%
rename from src/lsmsvgenums.c
rename to svg/lsmsvgenums.c
diff --git a/src/lsmsvgenums.h b/svg/lsmsvgenums.h
similarity index 100%
rename from src/lsmsvgenums.h
rename to svg/lsmsvgenums.h
diff --git a/src/lsmsvgenumtypes.c.template b/svg/lsmsvgenumtypes.c.template
similarity index 100%
rename from src/lsmsvgenumtypes.c.template
rename to svg/lsmsvgenumtypes.c.template
diff --git a/src/lsmsvgenumtypes.h.template b/svg/lsmsvgenumtypes.h.template
similarity index 100%
rename from src/lsmsvgenumtypes.h.template
rename to svg/lsmsvgenumtypes.h.template
diff --git a/src/lsmsvgfilterelement.c b/svg/lsmsvgfilterelement.c
similarity index 100%
rename from src/lsmsvgfilterelement.c
rename to svg/lsmsvgfilterelement.c
diff --git a/src/lsmsvgfilterelement.h b/svg/lsmsvgfilterelement.h
similarity index 100%
rename from src/lsmsvgfilterelement.h
rename to svg/lsmsvgfilterelement.h
diff --git a/src/lsmsvgfiltergaussianblur.c b/svg/lsmsvgfiltergaussianblur.c
similarity index 100%
rename from src/lsmsvgfiltergaussianblur.c
rename to svg/lsmsvgfiltergaussianblur.c
diff --git a/src/lsmsvgfiltergaussianblur.h b/svg/lsmsvgfiltergaussianblur.h
similarity index 100%
rename from src/lsmsvgfiltergaussianblur.h
rename to svg/lsmsvgfiltergaussianblur.h
diff --git a/src/lsmsvgfilterprimitive.c b/svg/lsmsvgfilterprimitive.c
similarity index 100%
rename from src/lsmsvgfilterprimitive.c
rename to svg/lsmsvgfilterprimitive.c
diff --git a/src/lsmsvgfilterprimitive.h b/svg/lsmsvgfilterprimitive.h
similarity index 100%
rename from src/lsmsvgfilterprimitive.h
rename to svg/lsmsvgfilterprimitive.h
diff --git a/src/lsmsvggelement.c b/svg/lsmsvggelement.c
similarity index 100%
rename from src/lsmsvggelement.c
rename to svg/lsmsvggelement.c
diff --git a/src/lsmsvggelement.h b/svg/lsmsvggelement.h
similarity index 100%
rename from src/lsmsvggelement.h
rename to svg/lsmsvggelement.h
diff --git a/src/lsmsvggradientelement.c b/svg/lsmsvggradientelement.c
similarity index 100%
rename from src/lsmsvggradientelement.c
rename to svg/lsmsvggradientelement.c
diff --git a/src/lsmsvggradientelement.h b/svg/lsmsvggradientelement.h
similarity index 100%
rename from src/lsmsvggradientelement.h
rename to svg/lsmsvggradientelement.h
diff --git a/src/lsmsvgimageelement.c b/svg/lsmsvgimageelement.c
similarity index 100%
rename from src/lsmsvgimageelement.c
rename to svg/lsmsvgimageelement.c
diff --git a/src/lsmsvgimageelement.h b/svg/lsmsvgimageelement.h
similarity index 100%
rename from src/lsmsvgimageelement.h
rename to svg/lsmsvgimageelement.h
diff --git a/src/lsmsvglength.c b/svg/lsmsvglength.c
similarity index 100%
rename from src/lsmsvglength.c
rename to svg/lsmsvglength.c
diff --git a/src/lsmsvglength.h b/svg/lsmsvglength.h
similarity index 100%
rename from src/lsmsvglength.h
rename to svg/lsmsvglength.h
diff --git a/src/lsmsvglineargradientelement.c b/svg/lsmsvglineargradientelement.c
similarity index 100%
rename from src/lsmsvglineargradientelement.c
rename to svg/lsmsvglineargradientelement.c
diff --git a/src/lsmsvglineargradientelement.h b/svg/lsmsvglineargradientelement.h
similarity index 100%
rename from src/lsmsvglineargradientelement.h
rename to svg/lsmsvglineargradientelement.h
diff --git a/src/lsmsvglineelement.c b/svg/lsmsvglineelement.c
similarity index 100%
rename from src/lsmsvglineelement.c
rename to svg/lsmsvglineelement.c
diff --git a/src/lsmsvglineelement.h b/svg/lsmsvglineelement.h
similarity index 100%
rename from src/lsmsvglineelement.h
rename to svg/lsmsvglineelement.h
diff --git a/src/lsmsvgmarkerelement.c b/svg/lsmsvgmarkerelement.c
similarity index 100%
rename from src/lsmsvgmarkerelement.c
rename to svg/lsmsvgmarkerelement.c
diff --git a/src/lsmsvgmarkerelement.h b/svg/lsmsvgmarkerelement.h
similarity index 100%
rename from src/lsmsvgmarkerelement.h
rename to svg/lsmsvgmarkerelement.h
diff --git a/src/lsmsvgmaskelement.c b/svg/lsmsvgmaskelement.c
similarity index 100%
rename from src/lsmsvgmaskelement.c
rename to svg/lsmsvgmaskelement.c
diff --git a/src/lsmsvgmaskelement.h b/svg/lsmsvgmaskelement.h
similarity index 100%
rename from src/lsmsvgmaskelement.h
rename to svg/lsmsvgmaskelement.h
diff --git a/src/lsmsvgmatrix.c b/svg/lsmsvgmatrix.c
similarity index 100%
rename from src/lsmsvgmatrix.c
rename to svg/lsmsvgmatrix.c
diff --git a/src/lsmsvgmatrix.h b/svg/lsmsvgmatrix.h
similarity index 100%
rename from src/lsmsvgmatrix.h
rename to svg/lsmsvgmatrix.h
diff --git a/src/lsmsvgpathelement.c b/svg/lsmsvgpathelement.c
similarity index 100%
rename from src/lsmsvgpathelement.c
rename to svg/lsmsvgpathelement.c
diff --git a/src/lsmsvgpathelement.h b/svg/lsmsvgpathelement.h
similarity index 100%
rename from src/lsmsvgpathelement.h
rename to svg/lsmsvgpathelement.h
diff --git a/src/lsmsvgpatternelement.c b/svg/lsmsvgpatternelement.c
similarity index 100%
rename from src/lsmsvgpatternelement.c
rename to svg/lsmsvgpatternelement.c
diff --git a/src/lsmsvgpatternelement.h b/svg/lsmsvgpatternelement.h
similarity index 100%
rename from src/lsmsvgpatternelement.h
rename to svg/lsmsvgpatternelement.h
diff --git a/src/lsmsvgpolygonelement.c b/svg/lsmsvgpolygonelement.c
similarity index 100%
rename from src/lsmsvgpolygonelement.c
rename to svg/lsmsvgpolygonelement.c
diff --git a/src/lsmsvgpolygonelement.h b/svg/lsmsvgpolygonelement.h
similarity index 100%
rename from src/lsmsvgpolygonelement.h
rename to svg/lsmsvgpolygonelement.h
diff --git a/src/lsmsvgpolylineelement.c b/svg/lsmsvgpolylineelement.c
similarity index 100%
rename from src/lsmsvgpolylineelement.c
rename to svg/lsmsvgpolylineelement.c
diff --git a/src/lsmsvgpolylineelement.h b/svg/lsmsvgpolylineelement.h
similarity index 100%
rename from src/lsmsvgpolylineelement.h
rename to svg/lsmsvgpolylineelement.h
diff --git a/src/lsmsvgradialgradientelement.c b/svg/lsmsvgradialgradientelement.c
similarity index 100%
rename from src/lsmsvgradialgradientelement.c
rename to svg/lsmsvgradialgradientelement.c
diff --git a/src/lsmsvgradialgradientelement.h b/svg/lsmsvgradialgradientelement.h
similarity index 100%
rename from src/lsmsvgradialgradientelement.h
rename to svg/lsmsvgradialgradientelement.h
diff --git a/src/lsmsvgrectelement.c b/svg/lsmsvgrectelement.c
similarity index 100%
rename from src/lsmsvgrectelement.c
rename to svg/lsmsvgrectelement.c
diff --git a/src/lsmsvgrectelement.h b/svg/lsmsvgrectelement.h
similarity index 100%
rename from src/lsmsvgrectelement.h
rename to svg/lsmsvgrectelement.h
diff --git a/src/lsmsvgstopelement.c b/svg/lsmsvgstopelement.c
similarity index 100%
rename from src/lsmsvgstopelement.c
rename to svg/lsmsvgstopelement.c
diff --git a/src/lsmsvgstopelement.h b/svg/lsmsvgstopelement.h
similarity index 100%
rename from src/lsmsvgstopelement.h
rename to svg/lsmsvgstopelement.h
diff --git a/src/lsmsvgstyle.c b/svg/lsmsvgstyle.c
similarity index 100%
rename from src/lsmsvgstyle.c
rename to svg/lsmsvgstyle.c
diff --git a/src/lsmsvgstyle.h b/svg/lsmsvgstyle.h
similarity index 100%
rename from src/lsmsvgstyle.h
rename to svg/lsmsvgstyle.h
diff --git a/src/lsmsvgsvgelement.c b/svg/lsmsvgsvgelement.c
similarity index 100%
rename from src/lsmsvgsvgelement.c
rename to svg/lsmsvgsvgelement.c
diff --git a/src/lsmsvgsvgelement.h b/svg/lsmsvgsvgelement.h
similarity index 100%
rename from src/lsmsvgsvgelement.h
rename to svg/lsmsvgsvgelement.h
diff --git a/src/lsmsvgsymbolelement.c b/svg/lsmsvgsymbolelement.c
similarity index 100%
rename from src/lsmsvgsymbolelement.c
rename to svg/lsmsvgsymbolelement.c
diff --git a/src/lsmsvgsymbolelement.h b/svg/lsmsvgsymbolelement.h
similarity index 100%
rename from src/lsmsvgsymbolelement.h
rename to svg/lsmsvgsymbolelement.h
diff --git a/src/lsmsvgtextelement.c b/svg/lsmsvgtextelement.c
similarity index 100%
rename from src/lsmsvgtextelement.c
rename to svg/lsmsvgtextelement.c
diff --git a/src/lsmsvgtextelement.h b/svg/lsmsvgtextelement.h
similarity index 100%
rename from src/lsmsvgtextelement.h
rename to svg/lsmsvgtextelement.h
diff --git a/src/lsmsvgtraits.c b/svg/lsmsvgtraits.c
similarity index 100%
rename from src/lsmsvgtraits.c
rename to svg/lsmsvgtraits.c
diff --git a/src/lsmsvgtraits.h b/svg/lsmsvgtraits.h
similarity index 100%
rename from src/lsmsvgtraits.h
rename to svg/lsmsvgtraits.h
diff --git a/src/lsmsvgtspanelement.c b/svg/lsmsvgtspanelement.c
similarity index 100%
rename from src/lsmsvgtspanelement.c
rename to svg/lsmsvgtspanelement.c
diff --git a/src/lsmsvgtspanelement.h b/svg/lsmsvgtspanelement.h
similarity index 100%
rename from src/lsmsvgtspanelement.h
rename to svg/lsmsvgtspanelement.h
diff --git a/src/lsmsvgtypes.h b/svg/lsmsvgtypes.h
similarity index 100%
rename from src/lsmsvgtypes.h
rename to svg/lsmsvgtypes.h
diff --git a/src/lsmsvguseelement.c b/svg/lsmsvguseelement.c
similarity index 100%
rename from src/lsmsvguseelement.c
rename to svg/lsmsvguseelement.c
diff --git a/src/lsmsvguseelement.h b/svg/lsmsvguseelement.h
similarity index 100%
rename from src/lsmsvguseelement.h
rename to svg/lsmsvguseelement.h
diff --git a/src/lsmsvgview.c b/svg/lsmsvgview.c
similarity index 100%
rename from src/lsmsvgview.c
rename to svg/lsmsvgview.c
diff --git a/src/lsmsvgview.h b/svg/lsmsvgview.h
similarity index 100%
rename from src/lsmsvgview.h
rename to svg/lsmsvgview.h
diff --git a/tests/Makefile.am b/tests/Makefile.am
index c4b429a..2d128d8 100644
--- a/tests/Makefile.am
+++ b/tests/Makefile.am
@@ -1,9 +1,9 @@
 include $(top_srcdir)/Makefile.decl
 
-INCLUDES = -g -I$(top_srcdir)/src/ $(LASEM_CFLAGS)
+INCLUDES = -g -I$(top_srcdir)/dom/ $(LASEM_CFLAGS)
 
 test_progs_ldadd = 					\
-	$(top_builddir)/src/liblasem- LASEM_API_VERSION@.la		\
+	$(top_builddir)/dom/liblasem-dom- LASEM_API_VERSION@.la		\
 	$(top_builddir)/itex2mml/libitex2mml.la		\
 	$(LASEM_LIBS)
 
diff --git a/tests/lsmtest.c b/tests/lsmtest.c
index 48ab51d..0c5a2ce 100644
--- a/tests/lsmtest.c
+++ b/tests/lsmtest.c
@@ -31,7 +31,8 @@
 #include <unistd.h>
 #endif
 
-#include <lsmmathml.h>
+/*#include <lsmmathml.h>*/
+#include <lsmdom.h>
 #include <glib.h>
 #include <gio/gio.h>
[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]