GNOME.org
 

[lasem] build: single header include (mathml).

commit 4603b654c5be1d983eadc7d37b522c28eb86cd18
Author: Emmanuel Pacaud <emmanuel gnome org>
Date:   Sun Nov 7 22:09:20 2010 +0100

    build: single header include (mathml).

 src/lasemrender.c                    |    8 +---
 src/lsmmathml.h                      |   74 +++++++++++++++++----------------
 src/lsmmathmlactionelement.h         |    2 +-
 src/lsmmathmlaligngroupelement.h     |    2 +-
 src/lsmmathmlalignmarkelement.h      |    2 +-
 src/lsmmathmlattributes.h            |    2 +-
 src/lsmmathmldocument.h              |    2 +-
 src/lsmmathmlelement.h               |    2 +-
 src/lsmmathmlentitydictionary.h      |    2 +-
 src/lsmmathmlenums.c                 |    4 +-
 src/lsmmathmlenums.h                 |    6 +-
 src/lsmmathmlerrorelement.h          |    2 +-
 src/lsmmathmlfencedelement.h         |    2 +-
 src/lsmmathmlfractionelement.h       |    2 +-
 src/lsmmathmlglyphtableams.h         |    2 +-
 src/lsmmathmlitexelement.h           |    2 +-
 src/lsmmathmllayoututils.h           |    2 +-
 src/lsmmathmlmathelement.h           |    2 +-
 src/lsmmathmloperatordictionary.h    |    2 +-
 src/lsmmathmloperatorelement.h       |    2 +-
 src/lsmmathmlpaddedelement.h         |    2 +-
 src/lsmmathmlphantomelement.h        |    2 +-
 src/lsmmathmlpresentationcontainer.h |    2 +-
 src/lsmmathmlpresentationtoken.h     |    2 +-
 src/lsmmathmlradicalelement.h        |    2 +-
 src/lsmmathmlrowelement.h            |    2 +-
 src/lsmmathmlscriptelement.h         |    2 +-
 src/lsmmathmlspaceelement.h          |    2 +-
 src/lsmmathmlstringelement.h         |    2 +-
 src/lsmmathmlstyle.h                 |    2 +-
 src/lsmmathmlstyleelement.h          |    2 +-
 src/lsmmathmltablecellelement.h      |    2 +-
 src/lsmmathmltableelement.h          |    2 +-
 src/lsmmathmltablerowelement.h       |    2 +-
 src/lsmmathmltypes.h                 |   65 +++++++++++++++++++++++++++++
 src/lsmmathmlunderoverelement.h      |    2 +-
 src/lsmmathmlutils.h                 |    2 +-
 src/lsmmathmlview.h                  |    2 +-
 tests/dom.c                          |    2 +-
 tests/lsmtest.c                      |    8 +---
 tests/suite.c                        |    2 +-
 41 files changed, 146 insertions(+), 89 deletions(-)
---
diff --git a/src/lasemrender.c b/src/lasemrender.c
index 9ae070f..c3b2f63 100644
--- a/src/lasemrender.c
+++ b/src/lasemrender.c
@@ -22,13 +22,7 @@
 
 #include <stdio.h>
 #include <string.h>
-#include <lsmdom.h>
-#include <lsmmathmloperatordictionary.h>
-#include <lsmmathmldocument.h>
-#include <lsmmathmlmathelement.h>
-#include <lsmmathmlfractionelement.h>
-#include <lsmmathmlrowelement.h>
-#include <lsmmathmlview.h>
+#include <lsmmathml.h>
 #include <glib/gmessages.h>
 #include <glib/goption.h>
 #include <glib/gprintf.h>
diff --git a/src/lsmmathml.h b/src/lsmmathml.h
index e00a00e..aad800b 100644
--- a/src/lsmmathml.h
+++ b/src/lsmmathml.h
@@ -1,6 +1,6 @@
-/* lsmmathml.h
+/* Lasem - SVG and Mathml library
  *
- * Copyright © 2007-2008  Emmanuel Pacaud
+ * Copyright © 2007-2008 Emmanuel Pacaud
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Lesser General Public
@@ -26,40 +26,42 @@
 
 #include <lsmdom.h>
 
-G_BEGIN_DECLS
+#include <lsmmathmltypes.h>
 
-typedef struct _LsmMathmlDocument LsmMathmlDocument;
-typedef struct _LsmMathmlElement LsmMathmlElement;
-typedef struct _LsmMathmlPhantomElement LsmMathmlPhantomElement;
-typedef struct _LsmMathmlTableElement LsmMathmlTableElement;
-typedef struct _LsmMathmlTableRowElement LsmMathmlTableRowElement;
-typedef struct _LsmMathmlTableCellElement LsmMathmlTableCellElement;
-typedef struct _LsmMathmlSpaceElement LsmMathmlSpaceElement;
-typedef struct _LsmMathmlFractionElement LsmMathmlFractionElement;
-typedef struct _LsmMathmlUnderOverElement LsmMathmlUnderOverElement;
-typedef struct _LsmMathmlMathElement LsmMathmlMathElement;
-typedef struct _LsmMathmlRadicalElement LsmMathmlRadicalElement;
-typedef struct _LsmMathmlScriptElement LsmMathmlScriptElement;
-typedef struct _LsmMathmlPresentationToken LsmMathmlPresentationToken;
-typedef struct _LsmMathmlNumberElement LsmMathmlNumberElement;
-typedef struct _LsmMathmlOperatorElement LsmMathmlOperatorElement;
-typedef struct _LsmMathmlStringElement LsmMathmlStringElement;
-typedef struct _LsmMathmlPresentationContainer LsmMathmlPresentationContainer;
-typedef struct _LsmMathmlStyleElement LsmMathmlStyleElement;
-typedef struct _LsmMathmlRowElement LsmMathmlRowElement;
-typedef struct _LsmMathmlFencedElement LsmMathmlFencedElement;
-typedef struct _LsmMathmlPaddedElement LsmMathmlPaddedElement;
-typedef struct _LsmMathmlErrorElement LsmMathmlErrorElement;
-typedef struct _LsmMathmlActionElement LsmMathmlActionElement;
-typedef struct _LsmMathmlAlignMarkElement LsmMathmlAlignMarkElement;
-typedef struct _LsmMathmlAlignGroupElement LsmMathmlAlignGroupElement;
-
-typedef struct _LsmMathmlItexElement LsmMathmlItexElement;
-
-typedef struct _LsmMathmlView LsmMathmlView;
-
-typedef struct _LsmMathmlStyle LsmMathmlStyle;
-
-G_END_DECLS
+#include <lsmmathmlenums.h>
+#include <lsmmathmltraits.h>
+#include <lsmmathmlattributes.h>
+#include <lsmmathmlentitydictionary.h>
+#include <lsmmathmloperatordictionary.h>
+#include <lsmmathmldocument.h>
+#include <lsmmathmlelement.h>
+#include <lsmmathmlphantomelement.h>
+#include <lsmmathmlmathelement.h>
+#include <lsmmathmltableelement.h>
+#include <lsmmathmltablerowelement.h>
+#include <lsmmathmltablecellelement.h>
+#include <lsmmathmlspaceelement.h>
+#include <lsmmathmlradicalelement.h>
+#include <lsmmathmlscriptelement.h>
+#include <lsmmathmlfractionelement.h>
+#include <lsmmathmlunderoverelement.h>
+#include <lsmmathmlpresentationtoken.h>
+#include <lsmmathmloperatorelement.h>
+#include <lsmmathmlstringelement.h>
+#include <lsmmathmlpresentationcontainer.h>
+#include <lsmmathmlstyleelement.h>
+#include <lsmmathmlrowelement.h>
+#include <lsmmathmlfencedelement.h>
+#include <lsmmathmlpaddedelement.h>
+#include <lsmmathmlerrorelement.h>
+#include <lsmmathmlactionelement.h>
+#include <lsmmathmlstyle.h>
+#include <lsmmathmlview.h>
+#include <lsmmathmlglyphtableams.h>
+#include <lsmmathmlalignmarkelement.h>
+#include <lsmmathmlaligngroupelement.h>
+#include <lsmmathmlitexelement.h>
+#include <lsmmathmlutils.h>
+#include <lsmmathmllayoututils.h>
 
 #endif
diff --git a/src/lsmmathmlactionelement.h b/src/lsmmathmlactionelement.h
index 5f9e295..e878738 100644
--- a/src/lsmmathmlactionelement.h
+++ b/src/lsmmathmlactionelement.h
@@ -23,7 +23,7 @@
 #ifndef LSM_MATHML_ACTION_ELEMENT_H
 #define LSM_MATHML_ACTION_ELEMENT_H
 
-#include <lsmmathml.h>
+#include <lsmmathmltypes.h>
 #include <lsmmathmlpresentationcontainer.h>
 
 G_BEGIN_DECLS
diff --git a/src/lsmmathmlaligngroupelement.h b/src/lsmmathmlaligngroupelement.h
index 9af1fb0..c336e1d 100644
--- a/src/lsmmathmlaligngroupelement.h
+++ b/src/lsmmathmlaligngroupelement.h
@@ -23,7 +23,7 @@
 #ifndef LSM_MATHML_ALIGN_GROUP_ELEMENT_H
 #define LSM_MATHML_ALIGN_GROUP_ELEMENT_H
 
-#include <lsmmathml.h>
+#include <lsmmathmltypes.h>
 #include <lsmmathmlelement.h>
 
 G_BEGIN_DECLS
diff --git a/src/lsmmathmlalignmarkelement.h b/src/lsmmathmlalignmarkelement.h
index df1e8c1..39d07c0 100644
--- a/src/lsmmathmlalignmarkelement.h
+++ b/src/lsmmathmlalignmarkelement.h
@@ -23,7 +23,7 @@
 #ifndef LSM_MATHML_ALIGN_MARK_ELEMENT_H
 #define LSM_MATHML_ALIGN_MARK_ELEMENT_H
 
-#include <lsmmathml.h>
+#include <lsmmathmltypes.h>
 #include <lsmmathmlelement.h>
 
 G_BEGIN_DECLS
diff --git a/src/lsmmathmlattributes.h b/src/lsmmathmlattributes.h
index b36cb8f..066db02 100644
--- a/src/lsmmathmlattributes.h
+++ b/src/lsmmathmlattributes.h
@@ -25,7 +25,7 @@
 
 #include <lsmattributes.h>
 #include <lsmdom.h>
-#include <lsmmathml.h>
+#include <lsmmathmltypes.h>
 #include <lsmmathmlenums.h>
 #include <lsmmathmltraits.h>
 
diff --git a/src/lsmmathmldocument.h b/src/lsmmathmldocument.h
index adf65f6..030c4ce 100644
--- a/src/lsmmathmldocument.h
+++ b/src/lsmmathmldocument.h
@@ -24,7 +24,7 @@
 #ifndef LSM_MATHML_DOCUMENT_H
 #define LSM_MATHML_DOCUMENT_H
 
-#include <lsmmathml.h>
+#include <lsmmathmltypes.h>
 #include <lsmdomdocument.h>
 
 G_BEGIN_DECLS
diff --git a/src/lsmmathmlelement.h b/src/lsmmathmlelement.h
index b3273b3..b792eb6 100644
--- a/src/lsmmathmlelement.h
+++ b/src/lsmmathmlelement.h
@@ -25,7 +25,7 @@
 #define LSM_MATHML_ELEMENT_H
 
 #include <lsmdomelement.h>
-#include <lsmmathml.h>
+#include <lsmmathmltypes.h>
 #include <lsmmathmlutils.h>
 #include <lsmmathmlstyle.h>
 #include <lsmmathmlattributes.h>
diff --git a/src/lsmmathmlentitydictionary.h b/src/lsmmathmlentitydictionary.h
index 8ea7533..6bcaee6 100644
--- a/src/lsmmathmlentitydictionary.h
+++ b/src/lsmmathmlentitydictionary.h
@@ -24,7 +24,7 @@
 #ifndef LSM_MATHML_ENTITY_DICTIONARY_H
 #define LSM_MATHML_ENTITY_DICTIONARY_H
 
-#include <lsmmathml.h>
+#include <lsmmathmltypes.h>
 
 G_BEGIN_DECLS
 
diff --git a/src/lsmmathmlenums.c b/src/lsmmathmlenums.c
index f374770..8faa916 100644
--- a/src/lsmmathmlenums.c
+++ b/src/lsmmathmlenums.c
@@ -1,6 +1,6 @@
-/* lsmmathmlenums.c
+/* Lasem - SVG and Mathml library
  *
- * Copyright © 2007-2008  Emmanuel Pacaud
+ * Copyright © 2007-2008 Emmanuel Pacaud
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Lesser General Public
diff --git a/src/lsmmathmlenums.h b/src/lsmmathmlenums.h
index 5d4e117..ae0fd79 100644
--- a/src/lsmmathmlenums.h
+++ b/src/lsmmathmlenums.h
@@ -1,6 +1,6 @@
-/* lsmmathmlenums.h
+/* Lasem - SVG and Mathml library
  *
- * Copyright © 2007-2008  Emmanuel Pacaud
+ * Copyright © 2007-2008 Emmanuel Pacaud
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Lesser General Public
@@ -24,7 +24,7 @@
 #ifndef LSM_MATHML_ENUMS_H
 #define LSM_MATHML_ENUMS_H
 
-#include <lsmmathml.h>
+#include <glib-object.h>
 
 G_BEGIN_DECLS
 
diff --git a/src/lsmmathmlerrorelement.h b/src/lsmmathmlerrorelement.h
index c9f1b06..8c3ed2c 100644
--- a/src/lsmmathmlerrorelement.h
+++ b/src/lsmmathmlerrorelement.h
@@ -24,7 +24,7 @@
 #ifndef LSM_MATHML_ERROR_ELEMENT_H
 #define LSM_MATHML_ERROR_ELEMENT_H
 
-#include <lsmmathml.h>
+#include <lsmmathmltypes.h>
 #include <lsmmathmlpresentationcontainer.h>
 
 G_BEGIN_DECLS
diff --git a/src/lsmmathmlfencedelement.h b/src/lsmmathmlfencedelement.h
index 39f42ab..54fdd07 100644
--- a/src/lsmmathmlfencedelement.h
+++ b/src/lsmmathmlfencedelement.h
@@ -24,7 +24,7 @@
 #ifndef LSM_MATHML_FENCED_ELEMENT_H
 #define LSM_MATHML_FENCED_ELEMENT_H
 
-#include <lsmmathml.h>
+#include <lsmmathmltypes.h>
 #include <lsmmathmlpresentationcontainer.h>
 
 G_BEGIN_DECLS
diff --git a/src/lsmmathmlfractionelement.h b/src/lsmmathmlfractionelement.h
index 2ed4947..ebec24c 100644
--- a/src/lsmmathmlfractionelement.h
+++ b/src/lsmmathmlfractionelement.h
@@ -24,7 +24,7 @@
 #ifndef LSM_MATHML_FRACTION_ELEMENT_H
 #define LSM_MATHML_FRACTION_ELEMENT_H
 
-#include <lsmmathml.h>
+#include <lsmmathmltypes.h>
 #include <lsmmathmlpresentationcontainer.h>
 
 G_BEGIN_DECLS
diff --git a/src/lsmmathmlglyphtableams.h b/src/lsmmathmlglyphtableams.h
index 55550ae..676d8a7 100644
--- a/src/lsmmathmlglyphtableams.h
+++ b/src/lsmmathmlglyphtableams.h
@@ -24,7 +24,7 @@
 #ifndef LSM_MATHML_GLYPH_TABLE_AMS_H
 #define LSM_MATHML_GLYPH_TABLE_AMS_H
 
-#include <lsmmathml.h>
+#include <lsmmathmltypes.h>
 #include <lsmmathmlview.h>
 
 G_BEGIN_DECLS
diff --git a/src/lsmmathmlitexelement.h b/src/lsmmathmlitexelement.h
index 2915a2b..d803bec 100644
--- a/src/lsmmathmlitexelement.h
+++ b/src/lsmmathmlitexelement.h
@@ -23,7 +23,7 @@
 #ifndef LSM_MATHML_ITEX_ELEMENT_H
 #define LSM_MATHML_ITEX_ELEMENT_H
 
-#include <lsmmathml.h>
+#include <lsmmathmltypes.h>
 #include <lsmmathmlelement.h>
 #include <lsmmathmldocument.h>
 
diff --git a/src/lsmmathmllayoututils.h b/src/lsmmathmllayoututils.h
index 89df1a2..a0833e4 100644
--- a/src/lsmmathmllayoututils.h
+++ b/src/lsmmathmllayoututils.h
@@ -23,7 +23,7 @@
 #ifndef LSM_MATHML_LAYOUT_UTILS_H
 #define LSM_MATHML_LAYOUT_UTILS_H
 
-#include <lsmmathml.h>
+#include <lsmmathmltypes.h>
 #include <lsmmathmlview.h>
 
 G_BEGIN_DECLS
diff --git a/src/lsmmathmlmathelement.h b/src/lsmmathmlmathelement.h
index d346c29..369094c 100644
--- a/src/lsmmathmlmathelement.h
+++ b/src/lsmmathmlmathelement.h
@@ -24,7 +24,7 @@
 #ifndef LSM_MATHML_MATH_ELEMENT_H
 #define LSM_MATHML_MATH_ELEMENT_H
 
-#include <lsmmathml.h>
+#include <lsmmathmltypes.h>
 #include <lsmmathmlelement.h>
 
 G_BEGIN_DECLS
diff --git a/src/lsmmathmloperatordictionary.h b/src/lsmmathmloperatordictionary.h
index e50d118..e465a79 100644
--- a/src/lsmmathmloperatordictionary.h
+++ b/src/lsmmathmloperatordictionary.h
@@ -24,7 +24,7 @@
 #ifndef LSM_MATHML_OPERATOR_DICTIONARY_H
 #define LSM_MATHML_OPERATOR_DICTIONARY_H
 
-#include <lsmmathml.h>
+#include <lsmmathmltypes.h>
 #include <lsmmathmlenums.h>
 #include <lsmmathmlattributes.h>
 
diff --git a/src/lsmmathmloperatorelement.h b/src/lsmmathmloperatorelement.h
index c459d21..5ec429b 100644
--- a/src/lsmmathmloperatorelement.h
+++ b/src/lsmmathmloperatorelement.h
@@ -24,7 +24,7 @@
 #ifndef LSM_MATHML_OPERATOR_ELEMENT_H
 #define LSM_MATHML_OPERATOR_ELEMENT_H
 
-#include <lsmmathml.h>
+#include <lsmmathmltypes.h>
 #include <lsmmathmlpresentationtoken.h>
 
 G_BEGIN_DECLS
diff --git a/src/lsmmathmlpaddedelement.h b/src/lsmmathmlpaddedelement.h
index 2ad1795..039a339 100644
--- a/src/lsmmathmlpaddedelement.h
+++ b/src/lsmmathmlpaddedelement.h
@@ -24,7 +24,7 @@
 #ifndef LSM_MATHML_PADDED_ELEMENT_H
 #define LSM_MATHML_PADDED_ELEMENT_H
 
-#include <lsmmathml.h>
+#include <lsmmathmltypes.h>
 #include <lsmmathmlpresentationcontainer.h>
 
 G_BEGIN_DECLS
diff --git a/src/lsmmathmlphantomelement.h b/src/lsmmathmlphantomelement.h
index 374b90d..3bb3696 100644
--- a/src/lsmmathmlphantomelement.h
+++ b/src/lsmmathmlphantomelement.h
@@ -24,7 +24,7 @@
 #ifndef LSM_MATHML_PHANTOM_ELEMENT_H
 #define LSM_MATHML_PHANTOM_ELEMENT_H
 
-#include <lsmmathml.h>
+#include <lsmmathmltypes.h>
 #include <lsmmathmlelement.h>
 
 G_BEGIN_DECLS
diff --git a/src/lsmmathmlpresentationcontainer.h b/src/lsmmathmlpresentationcontainer.h
index ddd5814..31b0cb2 100644
--- a/src/lsmmathmlpresentationcontainer.h
+++ b/src/lsmmathmlpresentationcontainer.h
@@ -24,7 +24,7 @@
 #ifndef LSM_MATHML_PRESENTATION_CONTAINER_H
 #define LSM_MATHML_PRESENTATION_CONTAINER_H
 
-#include <lsmmathml.h>
+#include <lsmmathmltypes.h>
 #include <lsmmathmlelement.h>
 
 G_BEGIN_DECLS
diff --git a/src/lsmmathmlpresentationtoken.h b/src/lsmmathmlpresentationtoken.h
index 15d94d8..679e77d 100644
--- a/src/lsmmathmlpresentationtoken.h
+++ b/src/lsmmathmlpresentationtoken.h
@@ -24,7 +24,7 @@
 #ifndef LSM_MATHML_PRESENTATION_TOKEN_H
 #define LSM_MATHML_PRESENTATION_TOKEN_H
 
-#include <lsmmathml.h>
+#include <lsmmathmltypes.h>
 #include <lsmmathmlelement.h>
 
 G_BEGIN_DECLS
diff --git a/src/lsmmathmlradicalelement.h b/src/lsmmathmlradicalelement.h
index 9ffc900..df25bec 100644
--- a/src/lsmmathmlradicalelement.h
+++ b/src/lsmmathmlradicalelement.h
@@ -24,7 +24,7 @@
 #ifndef LSM_MATHML_RADICAL_ELEMENT_H
 #define LSM_MATHML_RADICAL_ELEMENT_H
 
-#include <lsmmathml.h>
+#include <lsmmathmltypes.h>
 #include <lsmmathmlelement.h>
 
 G_BEGIN_DECLS
diff --git a/src/lsmmathmlrowelement.h b/src/lsmmathmlrowelement.h
index 2892c85..d310ba5 100644
--- a/src/lsmmathmlrowelement.h
+++ b/src/lsmmathmlrowelement.h
@@ -24,7 +24,7 @@
 #ifndef LSM_MATHML_ROW_ELEMENT_H
 #define LSM_MATHML_ROW_ELEMENT_H
 
-#include <lsmmathml.h>
+#include <lsmmathmltypes.h>
 #include <lsmmathmlpresentationcontainer.h>
 
 G_BEGIN_DECLS
diff --git a/src/lsmmathmlscriptelement.h b/src/lsmmathmlscriptelement.h
index e38970e..6a44ad7 100644
--- a/src/lsmmathmlscriptelement.h
+++ b/src/lsmmathmlscriptelement.h
@@ -24,7 +24,7 @@
 #ifndef LSM_MATHML_SCRIPT_ELEMENT_H
 #define LSM_MATHML_SCRIPT_ELEMENT_H
 
-#include <lsmmathml.h>
+#include <lsmmathmltypes.h>
 #include <lsmmathmlelement.h>
 
 G_BEGIN_DECLS
diff --git a/src/lsmmathmlspaceelement.h b/src/lsmmathmlspaceelement.h
index 9e0ae0c..7792a47 100644
--- a/src/lsmmathmlspaceelement.h
+++ b/src/lsmmathmlspaceelement.h
@@ -24,7 +24,7 @@
 #ifndef LSM_MATHML_SPACE_ELEMENT_H
 #define LSM_MATHML_SPACE_ELEMENT_H
 
-#include <lsmmathml.h>
+#include <lsmmathmltypes.h>
 #include <lsmmathmlelement.h>
 
 G_BEGIN_DECLS
diff --git a/src/lsmmathmlstringelement.h b/src/lsmmathmlstringelement.h
index 51b1afb..4f5dde5 100644
--- a/src/lsmmathmlstringelement.h
+++ b/src/lsmmathmlstringelement.h
@@ -23,7 +23,7 @@
 #ifndef LSM_MATHML_STRING_ELEMENT_H
 #define LSM_MATHML_STRING_ELEMENT_H
 
-#include <lsmmathml.h>
+#include <lsmmathmltypes.h>
 #include <lsmmathmlpresentationtoken.h>
 
 G_BEGIN_DECLS
diff --git a/src/lsmmathmlstyle.h b/src/lsmmathmlstyle.h
index b921f63..66b94ec 100644
--- a/src/lsmmathmlstyle.h
+++ b/src/lsmmathmlstyle.h
@@ -23,7 +23,7 @@
 #ifndef LSM_MATHML_STYLE_H
 #define LSM_MATHML_STYLE_H
 
-#include <lsmmathml.h>
+#include <lsmmathmltypes.h>
 #include <lsmmathmlattributes.h>
 
 G_BEGIN_DECLS
diff --git a/src/lsmmathmlstyleelement.h b/src/lsmmathmlstyleelement.h
index e0e8ebb..f50d2b3 100644
--- a/src/lsmmathmlstyleelement.h
+++ b/src/lsmmathmlstyleelement.h
@@ -24,7 +24,7 @@
 #ifndef LSM_MATHML_STYLE_ELEMENT_H
 #define LSM_MATHML_STYLE_ELEMENT_H
 
-#include <lsmmathml.h>
+#include <lsmmathmltypes.h>
 #include <lsmmathmlpresentationcontainer.h>
 
 G_BEGIN_DECLS
diff --git a/src/lsmmathmltablecellelement.h b/src/lsmmathmltablecellelement.h
index ea26312..7a1a013 100644
--- a/src/lsmmathmltablecellelement.h
+++ b/src/lsmmathmltablecellelement.h
@@ -24,7 +24,7 @@
 #ifndef LSM_MATHML_TABLE_CELL_ELEMENT_H
 #define LSM_MATHML_TABLE_CELL_ELEMENT_H
 
-#include <lsmmathml.h>
+#include <lsmmathmltypes.h>
 #include <lsmmathmlelement.h>
 
 G_BEGIN_DECLS
diff --git a/src/lsmmathmltableelement.h b/src/lsmmathmltableelement.h
index 79f9b9c..68fdf7a 100644
--- a/src/lsmmathmltableelement.h
+++ b/src/lsmmathmltableelement.h
@@ -24,7 +24,7 @@
 #ifndef LSM_MATHML_TABLE_ELEMENT_H
 #define LSM_MATHML_TABLE_ELEMENT_H
 
-#include <lsmmathml.h>
+#include <lsmmathmltypes.h>
 #include <lsmmathmlelement.h>
 
 G_BEGIN_DECLS
diff --git a/src/lsmmathmltablerowelement.h b/src/lsmmathmltablerowelement.h
index 41f9a49..6789bd4 100644
--- a/src/lsmmathmltablerowelement.h
+++ b/src/lsmmathmltablerowelement.h
@@ -24,7 +24,7 @@
 #ifndef LSM_MATHML_TABLE_ROW_ELEMENT_H
 #define LSM_MATHML_TABLE_ROW_ELEMENT_H
 
-#include <lsmmathml.h>
+#include <lsmmathmltypes.h>
 #include <lsmmathmlelement.h>
 
 G_BEGIN_DECLS
diff --git a/src/lsmmathmltypes.h b/src/lsmmathmltypes.h
new file mode 100644
index 0000000..aea7c6c
--- /dev/null
+++ b/src/lsmmathmltypes.h
@@ -0,0 +1,65 @@
+/* Lasem - SVG and Mathml library
+ *
+ * Copyright © 2007-2008 Emmanuel Pacaud
+ *
+ * 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 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.
+ *
+ * Author:
+ * 	Emmanuel Pacaud <emmanuel gnome org>
+ */
+
+#ifndef LSM_MATHML_TYPES_H
+#define LSM_MATHML_TYPES_H
+
+#include <lsmmathmlenums.h>
+
+G_BEGIN_DECLS
+
+typedef struct _LsmMathmlDocument LsmMathmlDocument;
+typedef struct _LsmMathmlElement LsmMathmlElement;
+typedef struct _LsmMathmlPhantomElement LsmMathmlPhantomElement;
+typedef struct _LsmMathmlTableElement LsmMathmlTableElement;
+typedef struct _LsmMathmlTableRowElement LsmMathmlTableRowElement;
+typedef struct _LsmMathmlTableCellElement LsmMathmlTableCellElement;
+typedef struct _LsmMathmlSpaceElement LsmMathmlSpaceElement;
+typedef struct _LsmMathmlFractionElement LsmMathmlFractionElement;
+typedef struct _LsmMathmlUnderOverElement LsmMathmlUnderOverElement;
+typedef struct _LsmMathmlMathElement LsmMathmlMathElement;
+typedef struct _LsmMathmlRadicalElement LsmMathmlRadicalElement;
+typedef struct _LsmMathmlScriptElement LsmMathmlScriptElement;
+typedef struct _LsmMathmlPresentationToken LsmMathmlPresentationToken;
+typedef struct _LsmMathmlNumberElement LsmMathmlNumberElement;
+typedef struct _LsmMathmlOperatorElement LsmMathmlOperatorElement;
+typedef struct _LsmMathmlStringElement LsmMathmlStringElement;
+typedef struct _LsmMathmlPresentationContainer LsmMathmlPresentationContainer;
+typedef struct _LsmMathmlStyleElement LsmMathmlStyleElement;
+typedef struct _LsmMathmlRowElement LsmMathmlRowElement;
+typedef struct _LsmMathmlFencedElement LsmMathmlFencedElement;
+typedef struct _LsmMathmlPaddedElement LsmMathmlPaddedElement;
+typedef struct _LsmMathmlErrorElement LsmMathmlErrorElement;
+typedef struct _LsmMathmlActionElement LsmMathmlActionElement;
+typedef struct _LsmMathmlAlignMarkElement LsmMathmlAlignMarkElement;
+typedef struct _LsmMathmlAlignGroupElement LsmMathmlAlignGroupElement;
+
+typedef struct _LsmMathmlItexElement LsmMathmlItexElement;
+
+typedef struct _LsmMathmlView LsmMathmlView;
+
+typedef struct _LsmMathmlStyle LsmMathmlStyle;
+
+G_END_DECLS
+
+#endif
diff --git a/src/lsmmathmlunderoverelement.h b/src/lsmmathmlunderoverelement.h
index 4a0c2ea..d15bc95 100644
--- a/src/lsmmathmlunderoverelement.h
+++ b/src/lsmmathmlunderoverelement.h
@@ -24,7 +24,7 @@
 #ifndef LSM_MATHML_UNDER_OVER_ELEMENT_H
 #define LSM_MATHML_UNDER_OVER_ELEMENT_H
 
-#include <lsmmathml.h>
+#include <lsmmathmltypes.h>
 #include <lsmmathmlelement.h>
 
 G_BEGIN_DECLS
diff --git a/src/lsmmathmlutils.h b/src/lsmmathmlutils.h
index c273da5..2bbac27 100644
--- a/src/lsmmathmlutils.h
+++ b/src/lsmmathmlutils.h
@@ -24,7 +24,7 @@
 #ifndef LSM_MATHML_UTILS_H
 #define LSM_MATHML_UTILS_H
 
-#include <lsmmathml.h>
+#include <lsmmathmltypes.h>
 
 G_BEGIN_DECLS
 
diff --git a/src/lsmmathmlview.h b/src/lsmmathmlview.h
index f4a5426..9f35733 100644
--- a/src/lsmmathmlview.h
+++ b/src/lsmmathmlview.h
@@ -25,7 +25,7 @@
 #define LSM_MATHML_VIEW_H
 
 #include <lsmdomview.h>
-#include <lsmmathml.h>
+#include <lsmmathmltypes.h>
 #include <lsmmathmlutils.h>
 #include <lsmmathmlelement.h>
 #include <lsmmathmlpresentationtoken.h>
diff --git a/tests/dom.c b/tests/dom.c
index d6ff626..7e57446 100644
--- a/tests/dom.c
+++ b/tests/dom.c
@@ -1,5 +1,5 @@
 #include <glib.h>
-#include <lsmdomimplementation.h>
+#include <lsmdom.h>
 
 static void
 create_document_test (void)
diff --git a/tests/lsmtest.c b/tests/lsmtest.c
index 4acb0e3..7f78fc2 100644
--- a/tests/lsmtest.c
+++ b/tests/lsmtest.c
@@ -31,12 +31,8 @@
 #include <unistd.h>
 #endif
 
-#include <lsmdebug.h>
-#include <lsmmathmldocument.h>
-#include <lsmdomparser.h>
-#include <lsmdomdocument.h>
-#include <glib/gregex.h>
-#include <glib/gprintf.h>
+#include <lsmmathml.h>
+#include <glib.h>
 #include <gio/gio.h>
 
 #include <libxml/parser.h>
diff --git a/tests/suite.c b/tests/suite.c
index aeeec8d..0acf285 100644
--- a/tests/suite.c
+++ b/tests/suite.c
@@ -1,6 +1,6 @@
 #include <glib.h>
 #include <string.h>
-#include <lsmdomparser.h>
+#include <lsmdom.h>
 
 static GSList *
 build_file_list (const char *path, GRegex *filename_regex)
[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]