[lasem/mml-attrs: 2/5] [Mathml] s/lsm_dom_attribute/lsm_mathml_attribute/g



commit e30881ee2d3b5b9392234ba5d00d9dd9be3616b9
Author: Emmanuel Pacaud <emmanuel gnome org>
Date:   Sun Nov 15 16:42:05 2009 +0100

    [Mathml] s/lsm_dom_attribute/lsm_mathml_attribute/g

 src/lsmmathmlattributes.c        |  262 +++++++++++++++++++-------------------
 src/lsmmathmlattributes.h        |   72 +++++-----
 src/lsmmathmlelement.c           |   14 +-
 src/lsmmathmlelement.h           |    8 +-
 src/lsmmathmlfencedelement.c     |    8 +-
 src/lsmmathmlfractionelement.c   |    6 +-
 src/lsmmathmlmathelement.c       |    6 +-
 src/lsmmathmloperatorelement.c   |   26 ++--
 src/lsmmathmlpresentationtoken.c |   22 ++--
 src/lsmmathmlspaceelement.c      |    8 +-
 src/lsmmathmlstringelement.c     |    6 +-
 src/lsmmathmlstyleelement.c      |   48 ++++----
 src/lsmmathmltablecellelement.c  |    6 +-
 src/lsmmathmltableelement.c      |   22 ++--
 src/lsmmathmlunderoverelement.c  |    6 +-
 15 files changed, 260 insertions(+), 260 deletions(-)
---
diff --git a/src/lsmmathmlattributes.c b/src/lsmmathmlattributes.c
index 8cfcdbc..8a2bcea 100644
--- a/src/lsmmathmlattributes.c
+++ b/src/lsmmathmlattributes.c
@@ -32,21 +32,21 @@
 
 typedef struct {
 	ptrdiff_t bag_offset;
-	const LsmDomAttributeBagClass *bag_class;
-} LsmDomAttributeBagInfos;
+	const LsmMathmlAttributeBagClass *bag_class;
+} LsmMathmlAttributeBagInfos;
 
 typedef struct {
 	ptrdiff_t attribute_offset;
-	const LsmDomAttributeClass *attribute_class;
-	LsmDomAttributeBagInfos *bag_infos;
-} LsmDomAttributeInfos;
+	const LsmMathmlAttributeClass *attribute_class;
+	LsmMathmlAttributeBagInfos *bag_infos;
+} LsmMathmlAttributeInfos;
 
-LsmDomAttributeMap *
-lsm_dom_attribute_map_new (void)
+LsmMathmlAttributeMap *
+lsm_mathml_attribute_map_new (void)
 {
-	LsmDomAttributeMap *map;
+	LsmMathmlAttributeMap *map;
 
-	map = g_new0 (LsmDomAttributeMap, 1);
+	map = g_new0 (LsmMathmlAttributeMap, 1);
 	g_return_val_if_fail (map != NULL,  NULL);
 
 	map->attribute_hash = g_hash_table_new_full (g_str_hash, g_str_equal, NULL, NULL);
@@ -55,15 +55,15 @@ lsm_dom_attribute_map_new (void)
 	return map;
 }
 
-LsmDomAttributeMap *
-lsm_dom_attribute_map_duplicate (const LsmDomAttributeMap *from)
+LsmMathmlAttributeMap *
+lsm_mathml_attribute_map_duplicate (const LsmMathmlAttributeMap *from)
 {
-	LsmDomAttributeMap *map;
+	LsmMathmlAttributeMap *map;
 	GHashTableIter iter;
 	void *key;
 	void *value;
 
-	map = lsm_dom_attribute_map_new ();
+	map = lsm_mathml_attribute_map_new ();
 	g_return_val_if_fail (map != NULL, NULL);
 
 	g_hash_table_iter_init (&iter, from->attribute_hash);
@@ -78,7 +78,7 @@ lsm_dom_attribute_map_duplicate (const LsmDomAttributeMap *from)
 }
 
 void
-lsm_dom_attribute_map_free (LsmDomAttributeMap *map)
+lsm_mathml_attribute_map_free (LsmMathmlAttributeMap *map)
 {
 	g_return_if_fail (map != NULL);
 
@@ -88,26 +88,26 @@ lsm_dom_attribute_map_free (LsmDomAttributeMap *map)
 }
 
 void
-lsm_dom_attribute_map_add_bag_attribute  (LsmDomAttributeMap *map,
-				       const char *name,
-				       ptrdiff_t attribute_offset,
-				       const LsmDomAttributeClass *attribute_class,
-				       ptrdiff_t bag_offset,
-				       const LsmDomAttributeBagClass *bag_class)
+lsm_mathml_attribute_map_add_bag_attribute  (LsmMathmlAttributeMap *map,
+					     const char *name,
+					     ptrdiff_t attribute_offset,
+					     const LsmMathmlAttributeClass *attribute_class,
+					     ptrdiff_t bag_offset,
+					     const LsmMathmlAttributeBagClass *bag_class)
 {
-	LsmDomAttributeInfos *attribute_infos;
-	LsmDomAttributeBagInfos *bag_infos;
+	LsmMathmlAttributeInfos *attribute_infos;
+	LsmMathmlAttributeBagInfos *bag_infos;
 
 	g_return_if_fail (map != NULL);
 	g_return_if_fail (name != NULL);
 	g_return_if_fail (attribute_offset >= 0);
 
 	if (g_hash_table_lookup (map->attribute_hash, name) != NULL) {
-		g_warning ("[LsmDomAttributeMap::add_attribute] %s already defined", name);
+		g_warning ("[LsmMathmlAttributeMap::add_attribute] %s already defined", name);
 		return;
 	}
 
-	attribute_infos = g_new (LsmDomAttributeInfos, 1);
+	attribute_infos = g_new (LsmMathmlAttributeInfos, 1);
 	attribute_infos->attribute_offset = attribute_offset;
 	attribute_infos->attribute_class = attribute_class;
 
@@ -116,7 +116,7 @@ lsm_dom_attribute_map_add_bag_attribute  (LsmDomAttributeMap *map,
 	if (bag_class != NULL) {
 		bag_infos = g_hash_table_lookup (map->bag_hash, bag_class);
 		if (bag_infos == NULL) {
-			bag_infos = g_new (LsmDomAttributeBagInfos, 1);
+			bag_infos = g_new (LsmMathmlAttributeBagInfos, 1);
 			bag_infos->bag_offset = bag_offset;
 			bag_infos->bag_class = bag_class;
 
@@ -129,49 +129,49 @@ lsm_dom_attribute_map_add_bag_attribute  (LsmDomAttributeMap *map,
 }
 
 void
-lsm_dom_attribute_map_add_attribute_full (LsmDomAttributeMap *map,
-					  const char *name,
-					  ptrdiff_t offset,
-					  const LsmDomAttributeClass *attribute_class)
+lsm_mathml_attribute_map_add_attribute_full (LsmMathmlAttributeMap *map,
+					     const char *name,
+					     ptrdiff_t offset,
+					     const LsmMathmlAttributeClass *attribute_class)
 {
-	lsm_dom_attribute_map_add_bag_attribute (map, name, offset, attribute_class, 0, NULL);
+	lsm_mathml_attribute_map_add_bag_attribute (map, name, offset, attribute_class, 0, NULL);
 }
 
 void
-lsm_dom_attribute_map_add_attribute_full_width_default (LsmDomAttributeMap *map,
-						     const char *name,
-						     ptrdiff_t offset,
-						     const LsmDomAttributeClass *attribute_class)
+lsm_mathml_attribute_map_add_attribute_full_width_default (LsmMathmlAttributeMap *map,
+							   const char *name,
+							   ptrdiff_t offset,
+							   const LsmMathmlAttributeClass *attribute_class)
 {
-	lsm_dom_attribute_map_add_bag_attribute (map, name, offset, attribute_class, 0, NULL);
+	lsm_mathml_attribute_map_add_bag_attribute (map, name, offset, attribute_class, 0, NULL);
 }
 
 void
-lsm_dom_attribute_map_add_attribute (LsmDomAttributeMap *map,
-				  const char *name,
-				  ptrdiff_t offset)
+lsm_mathml_attribute_map_add_attribute (LsmMathmlAttributeMap *map,
+					const char *name,
+					ptrdiff_t offset)
 {
-	lsm_dom_attribute_map_add_bag_attribute (map, name, offset, NULL, 0, NULL);
+	lsm_mathml_attribute_map_add_bag_attribute (map, name, offset, NULL, 0, NULL);
 }
 
-static LsmDomAttribute *
-_get_attribute (LsmDomAttributeMap *map,
+static LsmMathmlAttribute *
+_get_attribute (LsmMathmlAttributeMap *map,
 		void *instance,
 		const char *name)
 {
-	LsmDomAttributeInfos *attribute_infos;
-	LsmDomAttribute *attribute;
+	LsmMathmlAttributeInfos *attribute_infos;
+	LsmMathmlAttribute *attribute;
 
 	attribute_infos = g_hash_table_lookup (map->attribute_hash, name);
 	if (attribute_infos == NULL) {
-		lsm_debug ("[LsmDomAttribute] Attribute not found (%s)", name);
+		lsm_debug ("[LsmMathmlAttribute] Attribute not found (%s)", name);
 		return NULL;
 	}
 
 	if (attribute_infos->bag_infos == NULL)
 		attribute = (void *)(instance + attribute_infos->attribute_offset);
 	else {
-		LsmDomAttributeBag **bag_ptr;
+		LsmMathmlAttributeBag **bag_ptr;
 
 		bag_ptr = (void *)(instance + attribute_infos->bag_infos->bag_offset);
 		g_return_val_if_fail (bag_ptr != NULL, FALSE);
@@ -189,12 +189,12 @@ _get_attribute (LsmDomAttributeMap *map,
 }
 
 gboolean
-lsm_dom_attribute_map_set_attribute (LsmDomAttributeMap *map,
-				     void *instance,
-				     const char *name,
-				     const char *value)
+lsm_mathml_attribute_map_set_attribute (LsmMathmlAttributeMap *map,
+					void *instance,
+					const char *name,
+					const char *value)
 {
-	LsmDomAttribute *attribute;
+	LsmMathmlAttribute *attribute;
 
 	g_return_val_if_fail (map != NULL, FALSE);
 
@@ -209,13 +209,13 @@ lsm_dom_attribute_map_set_attribute (LsmDomAttributeMap *map,
 }
 
 gboolean
-lsm_dom_attribute_map_set_css_attribute (LsmDomAttributeMap *map,
-				      void *instance,
-				      const char *name,
-				      const char *value,
-				      LsmDomCssType type)
+lsm_mathml_attribute_map_set_css_attribute (LsmMathmlAttributeMap *map,
+					    void *instance,
+					    const char *name,
+					    const char *value,
+					    LsmDomCssType type)
 {
-	LsmDomAttribute *attribute;
+	LsmMathmlAttribute *attribute;
 
 	g_return_val_if_fail (map != NULL, FALSE);
 
@@ -231,12 +231,12 @@ lsm_dom_attribute_map_set_css_attribute (LsmDomAttributeMap *map,
 }
 
 char const *
-lsm_dom_attribute_map_get_attribute (LsmDomAttributeMap *map,
-				     void *instance,
-				     const char *name)
+lsm_mathml_attribute_map_get_attribute (LsmMathmlAttributeMap *map,
+					void *instance,
+					const char *name)
 {
-	LsmDomAttributeInfos *attribute_infos;
-	LsmDomAttribute *attribute;
+	LsmMathmlAttributeInfos *attribute_infos;
+	LsmMathmlAttribute *attribute;
 
 	g_return_val_if_fail (map != NULL, NULL);
 
@@ -247,7 +247,7 @@ lsm_dom_attribute_map_get_attribute (LsmDomAttributeMap *map,
 	if (attribute_infos->bag_infos == NULL)
 		attribute = (void *)(instance + attribute_infos->attribute_offset);
 	else {
-		LsmDomAttributeBag **bag_ptr;
+		LsmMathmlAttributeBag **bag_ptr;
 
 		bag_ptr = (void *)(instance + attribute_infos->bag_infos->bag_offset);
 		g_return_val_if_fail (bag_ptr != NULL, NULL);
@@ -261,12 +261,12 @@ lsm_dom_attribute_map_get_attribute (LsmDomAttributeMap *map,
 }
 
 gboolean
-lsm_dom_attribute_map_is_attribute_defined (LsmDomAttributeMap *map,
-					 void *instance,
-					 const char *name)
+lsm_mathml_attribute_map_is_attribute_defined (LsmMathmlAttributeMap *map,
+					       void *instance,
+					       const char *name)
 {
-	LsmDomAttributeInfos *attribute_infos;
-	LsmDomAttribute *attribute;
+	LsmMathmlAttributeInfos *attribute_infos;
+	LsmMathmlAttribute *attribute;
 
 	g_return_val_if_fail (map != NULL, FALSE);
 
@@ -281,18 +281,18 @@ lsm_dom_attribute_map_is_attribute_defined (LsmDomAttributeMap *map,
 }
 
 gboolean
-lsm_dom_attribute_is_defined (const LsmDomAttribute *attribute)
+lsm_mathml_attribute_is_defined (const LsmMathmlAttribute *attribute)
 {
 	return (attribute != NULL && attribute->value != NULL);
 }
 
 static void
-lsm_dom_attribute_finalize_cb (gpointer key,
-			    gpointer value,
-			    gpointer instance)
+lsm_mathml_attribute_finalize_cb (gpointer key,
+				  gpointer value,
+				  gpointer instance)
 {
-	LsmDomAttributeInfos *attribute_infos = value;
-	LsmDomAttribute *attribute;
+	LsmMathmlAttributeInfos *attribute_infos = value;
+	LsmMathmlAttribute *attribute;
 
 	attribute = (void *)(instance + attribute_infos->attribute_offset);
 	if (attribute != NULL) {
@@ -309,12 +309,12 @@ lsm_dom_attribute_finalize_cb (gpointer key,
 }
 
 static void
-lsm_dom_attribute_bag_finalize_cb (gpointer key,
-				gpointer value,
-				gpointer instance)
+lsm_mathml_attribute_bag_finalize_cb (gpointer key,
+				      gpointer value,
+				      gpointer instance)
 {
-	LsmDomAttributeBagInfos *bag_infos = value;
-	LsmDomAttributeBag **bag_ptr;
+	LsmMathmlAttributeBagInfos *bag_infos = value;
+	LsmMathmlAttributeBag **bag_ptr;
 
 	bag_ptr = (void *)(instance + bag_infos->bag_offset);
 	if (*bag_ptr != NULL) {
@@ -326,16 +326,16 @@ lsm_dom_attribute_bag_finalize_cb (gpointer key,
 }
 
 void
-lsm_dom_attribute_map_free_attributes (LsmDomAttributeMap *map, void *instance)
+lsm_mathml_attribute_map_free_attributes (LsmMathmlAttributeMap *map, void *instance)
 {
 	g_return_if_fail (map != NULL);
 
-	g_hash_table_foreach (map->attribute_hash, lsm_dom_attribute_finalize_cb, instance);
-	g_hash_table_foreach (map->bag_hash, lsm_dom_attribute_bag_finalize_cb, instance);
+	g_hash_table_foreach (map->attribute_hash, lsm_mathml_attribute_finalize_cb, instance);
+	g_hash_table_foreach (map->bag_hash, lsm_mathml_attribute_bag_finalize_cb, instance);
 }
 
 char const *
-lsm_dom_attribute_get_value (const LsmDomAttribute *attribute)
+lsm_mathml_attribute_get_value (const LsmMathmlAttribute *attribute)
 {
 	g_return_val_if_fail (attribute != NULL, NULL);
 
@@ -348,14 +348,14 @@ lsm_dom_attribute_get_value (const LsmDomAttribute *attribute)
 
 void
 lsm_dom_boolean_attribute_parse (LsmDomBooleanAttribute *attribute,
-			      gboolean *style_value)
+				 gboolean *style_value)
 {
 	const char *string;
 
 	g_return_if_fail (attribute != NULL);
 	g_return_if_fail (style_value != NULL);
 
-	string = lsm_dom_attribute_get_value ((LsmDomAttribute *) attribute);
+	string = lsm_mathml_attribute_get_value ((LsmMathmlAttribute *) attribute);
 	if (string == NULL) {
 		attribute->value = *style_value;
 		return;
@@ -367,14 +367,14 @@ lsm_dom_boolean_attribute_parse (LsmDomBooleanAttribute *attribute,
 
 void
 lsm_dom_unsigned_attribute_parse (LsmDomUnsignedAttribute *attribute,
-			       unsigned int *style_value)
+				  unsigned int *style_value)
 {
 	const char *string;
 
 	g_return_if_fail (attribute != NULL);
 	g_return_if_fail (style_value != NULL);
 
-	string = lsm_dom_attribute_get_value ((LsmDomAttribute *) attribute);
+	string = lsm_mathml_attribute_get_value ((LsmMathmlAttribute *) attribute);
 	if (string == NULL) {
 		attribute->value = *style_value;
 		return;
@@ -386,14 +386,14 @@ lsm_dom_unsigned_attribute_parse (LsmDomUnsignedAttribute *attribute,
 
 void
 lsm_dom_double_attribute_parse (LsmDomDoubleAttribute *attribute,
-			     double *style_value)
+				double *style_value)
 {
 	const char *string;
 
 	g_return_if_fail (attribute != NULL);
 	g_return_if_fail (style_value != NULL);
 
-	string = lsm_dom_attribute_get_value ((LsmDomAttribute *) attribute);
+	string = lsm_mathml_attribute_get_value ((LsmMathmlAttribute *) attribute);
 	if (string == NULL) {
 		attribute->value = *style_value;
 		return;
@@ -413,7 +413,7 @@ lsm_dom_string_attribute_parse (LsmDomStringAttribute *attribute,
 	g_return_if_fail (style_value != NULL);
 	g_return_if_fail (*style_value != NULL);
 
-	string = lsm_dom_attribute_get_value ((LsmDomAttribute *) attribute);
+	string = lsm_mathml_attribute_get_value ((LsmMathmlAttribute *) attribute);
 	if (string == NULL) {
 		g_free (attribute->value);
 		attribute->value = g_strdup (*style_value);
@@ -427,15 +427,15 @@ lsm_dom_string_attribute_parse (LsmDomStringAttribute *attribute,
 
 void
 lsm_dom_enum_attribute_parse (LsmDomEnumAttribute *attribute,
-			    unsigned int *style_value,
-			    LsmDomNamedConvert convert)
+			      unsigned int *style_value,
+			      LsmDomNamedConvert convert)
 {
 	const char *string;
 
 	g_return_if_fail (attribute != NULL);
 	g_return_if_fail (style_value != NULL);
 
-	string = lsm_dom_attribute_get_value ((LsmDomAttribute *) attribute);
+	string = lsm_mathml_attribute_get_value ((LsmMathmlAttribute *) attribute);
 	if (string == NULL) {
 		attribute->value = *style_value;
 		return;
@@ -447,8 +447,8 @@ lsm_dom_enum_attribute_parse (LsmDomEnumAttribute *attribute,
 
 void
 lsm_dom_enum_list_attribute_parse (LsmDomEnumListAttribute *attribute,
-				 LsmDomEnumList *style_value,
-				 LsmDomNamedConvert convert)
+				   LsmDomEnumList *style_value,
+				   LsmDomNamedConvert convert)
 {
 	const char *string;
 	char **items;
@@ -460,7 +460,7 @@ lsm_dom_enum_list_attribute_parse (LsmDomEnumListAttribute *attribute,
 	g_free (attribute->values);
 	attribute->n_values = 0;
 
-	string = lsm_dom_attribute_get_value ((LsmDomAttribute *) attribute);
+	string = lsm_mathml_attribute_get_value ((LsmMathmlAttribute *) attribute);
 	if (string == NULL) {
 		if (style_value->n_values > 0) {
 			attribute->values = g_new (unsigned int, style_value->n_values);
@@ -506,28 +506,28 @@ lsm_dom_enum_list_attribute_finalize (void *abstract)
 	attribute->values = NULL;
 }
 
-static const LsmDomAttributeClass string_attribute_class = {
+static const LsmMathmlAttributeClass string_attribute_class = {
 	.finalize = lsm_dom_string_attribute_finalize
 };
 
 void
-lsm_dom_attribute_map_add_string (LsmDomAttributeMap *map,
-			       char const *name,
-			       ptrdiff_t offset)
+lsm_mathml_attribute_map_add_string (LsmMathmlAttributeMap *map,
+				     char const *name,
+				     ptrdiff_t offset)
 {
-	lsm_dom_attribute_map_add_attribute_full (map, name, offset, &string_attribute_class);
+	lsm_mathml_attribute_map_add_attribute_full (map, name, offset, &string_attribute_class);
 }
 
-static const LsmDomAttributeClass enum_list_attribute_class = {
+static const LsmMathmlAttributeClass enum_list_attribute_class = {
 	.finalize = lsm_dom_enum_list_attribute_finalize
 };
 
 void
-lsm_dom_attribute_map_add_enum_list (LsmDomAttributeMap *map,
-				   char const *name,
-				   ptrdiff_t offset)
+lsm_mathml_attribute_map_add_enum_list (LsmMathmlAttributeMap *map,
+					char const *name,
+					ptrdiff_t offset)
 {
-	lsm_dom_attribute_map_add_attribute_full (map, name, offset, &enum_list_attribute_class);
+	lsm_mathml_attribute_map_add_attribute_full (map, name, offset, &enum_list_attribute_class);
 }
 
 static LsmMathmlColor *
@@ -647,7 +647,7 @@ lsm_mathml_length_compute (const LsmMathmlLength *length, double default_value,
 
 void
 lsm_mathml_script_level_attribute_parse (LsmMathmlScriptLevelAttribute *attribute,
-				      int *style_value)
+					 int *style_value)
 {
 	const char *string;
 	int value;
@@ -655,7 +655,7 @@ lsm_mathml_script_level_attribute_parse (LsmMathmlScriptLevelAttribute *attribut
 	g_return_if_fail (attribute != NULL);
 	g_return_if_fail (style_value != NULL);
 
-	string = lsm_dom_attribute_get_value ((LsmDomAttribute *) attribute);
+	string = lsm_mathml_attribute_get_value ((LsmMathmlAttribute *) attribute);
 	if (string == NULL) {
 		attribute->value = *style_value;
 		return;
@@ -673,14 +673,14 @@ lsm_mathml_script_level_attribute_parse (LsmMathmlScriptLevelAttribute *attribut
 
 void
 lsm_mathml_color_attribute_parse (LsmMathmlColorAttribute *attribute,
-			       LsmMathmlColor *style_color)
+				  LsmMathmlColor *style_color)
 {
 	const char *string;
 
 	g_return_if_fail (attribute != NULL);
 	g_return_if_fail (style_color != NULL);
 
-	string = lsm_dom_attribute_get_value ((LsmDomAttribute *) attribute);
+	string = lsm_mathml_attribute_get_value ((LsmMathmlAttribute *) attribute);
 	if (string == NULL) {
 		attribute->color.red = style_color->red;
 		attribute->color.green = style_color->green;
@@ -708,49 +708,49 @@ lsm_mathml_color_attribute_parse (LsmMathmlColorAttribute *attribute,
 
 void
 lsm_mathml_mode_attribute_parse (LsmDomEnumAttribute *attribute,
-			      unsigned int *style_value)
+				 unsigned int *style_value)
 {
 	return lsm_dom_enum_attribute_parse (attribute, style_value, lsm_mathml_mode_from_string);
 }
 
 void
 lsm_mathml_display_attribute_parse (LsmDomEnumAttribute *attribute,
-				 unsigned int *style_value)
+				    unsigned int *style_value)
 {
 	return lsm_dom_enum_attribute_parse (attribute, style_value, lsm_mathml_display_from_string);
 }
 
 void
 lsm_mathml_form_attribute_parse (LsmDomEnumAttribute *attribute,
-			      unsigned int *style_value)
+				 unsigned int *style_value)
 {
 	return lsm_dom_enum_attribute_parse (attribute, style_value, lsm_mathml_form_from_string);
 }
 
 void
 lsm_mathml_font_style_attribute_parse (LsmDomEnumAttribute *attribute,
-				    unsigned int *style_value)
+				       unsigned int *style_value)
 {
 	return lsm_dom_enum_attribute_parse (attribute, style_value, lsm_mathml_font_style_from_string);
 }
 
 void
 lsm_mathml_font_weight_attribute_parse (LsmDomEnumAttribute *attribute,
-				     unsigned int *style_value)
+					unsigned int *style_value)
 {
 	return lsm_dom_enum_attribute_parse (attribute, style_value, lsm_mathml_font_weight_from_string);
 }
 
 void
 lsm_mathml_variant_attribute_parse (LsmDomEnumAttribute *attribute,
-				 unsigned int *style_value)
+				    unsigned int *style_value)
 {
 	return lsm_dom_enum_attribute_parse (attribute, style_value, lsm_mathml_variant_from_string);
 }
 
 void
 lsm_mathml_line_attribute_parse (LsmDomEnumAttribute *attribute,
-			      unsigned int *style_value)
+				 unsigned int *style_value)
 {
 	return lsm_dom_enum_attribute_parse (attribute, style_value, lsm_mathml_line_from_string);
 }
@@ -766,7 +766,7 @@ lsm_mathml_length_attribute_parse (LsmMathmlLengthAttribute *attribute,
 	g_return_if_fail (attribute != NULL);
 	g_return_if_fail (style_value != NULL);
 
-	string = lsm_dom_attribute_get_value ((LsmDomAttribute *) attribute);
+	string = lsm_mathml_attribute_get_value ((LsmMathmlAttribute *) attribute);
 	if (string == NULL) {
 		attribute->length = *style_value;
 	} else {
@@ -804,15 +804,15 @@ lsm_mathml_length_attribute_parse (LsmMathmlLengthAttribute *attribute,
 
 void
 lsm_mathml_space_attribute_parse (LsmMathmlSpaceAttribute *attribute,
-			       LsmMathmlSpace *style_value,
-			       LsmMathmlStyle *style)
+				  LsmMathmlSpace *style_value,
+				  LsmMathmlStyle *style)
 {
 	const char *string;
 
 	g_return_if_fail (attribute != NULL);
 	g_return_if_fail (style != NULL);
 
-	string = lsm_dom_attribute_get_value ((LsmDomAttribute *) attribute);
+	string = lsm_mathml_attribute_get_value ((LsmMathmlAttribute *) attribute);
 	if (string == NULL) {
 		attribute->space = *style_value;
 	} else {
@@ -955,8 +955,8 @@ lsm_mathml_space_list_attribute_finalize (void *abstract)
 
 void
 lsm_mathml_space_list_attribute_parse (LsmMathmlSpaceListAttribute *attribute,
-				    LsmMathmlSpaceList *style_value,
-				    const LsmMathmlStyle *style)
+				       LsmMathmlSpaceList *style_value,
+				       const LsmMathmlStyle *style)
 {
 	unsigned int i;
 	const char *string;
@@ -966,7 +966,7 @@ lsm_mathml_space_list_attribute_parse (LsmMathmlSpaceListAttribute *attribute,
 
 	lsm_mathml_space_list_attribute_finalize (attribute);
 
-	string = lsm_dom_attribute_get_value ((LsmDomAttribute *) attribute);
+	string = lsm_mathml_attribute_get_value ((LsmMathmlAttribute *) attribute);
 	if (string == NULL) {
 		attribute->space_list = lsm_mathml_space_list_duplicate (style_value);
 	} else {
@@ -1083,33 +1083,33 @@ lsm_mathml_space_list_attribute_parse (LsmMathmlSpaceListAttribute *attribute,
 
 void
 lsm_mathml_row_align_list_attribute_parse (LsmDomEnumListAttribute *attribute,
-					LsmDomEnumList *style_value)
+					   LsmDomEnumList *style_value)
 {
 	lsm_dom_enum_list_attribute_parse (attribute, style_value, lsm_mathml_row_align_from_string);
 }
 
 void
 lsm_mathml_column_align_list_attribute_parse (LsmDomEnumListAttribute *attribute,
-					   LsmDomEnumList *style_value)
+					      LsmDomEnumList *style_value)
 {
 	lsm_dom_enum_list_attribute_parse (attribute, style_value, lsm_mathml_column_align_from_string);
 }
 
 void
 lsm_mathml_line_list_attribute_parse (LsmDomEnumListAttribute *attribute,
-				   LsmDomEnumList *style_value)
+				      LsmDomEnumList *style_value)
 {
 	lsm_dom_enum_list_attribute_parse (attribute, style_value, lsm_mathml_line_from_string);
 }
 
-static const LsmDomAttributeClass space_list_attribute_class = {
+static const LsmMathmlAttributeClass space_list_attribute_class = {
 	.finalize = lsm_mathml_space_list_attribute_finalize
 };
 
 void
-lsm_dom_attribute_map_add_space_list (LsmDomAttributeMap *map,
-				   char const *name,
-				   ptrdiff_t offset)
+lsm_mathml_attribute_map_add_space_list (LsmMathmlAttributeMap *map,
+					 char const *name,
+					 ptrdiff_t offset)
 {
-	lsm_dom_attribute_map_add_attribute_full (map, name, offset, &space_list_attribute_class);
+	lsm_mathml_attribute_map_add_attribute_full (map, name, offset, &space_list_attribute_class);
 }
diff --git a/src/lsmmathmlattributes.h b/src/lsmmathmlattributes.h
index 83f0ef9..ffc1688 100644
--- a/src/lsmmathmlattributes.h
+++ b/src/lsmmathmlattributes.h
@@ -40,89 +40,89 @@ typedef struct {
 	char *value;
 	char *css_value;
 	LsmDomCssType css_type;
-} LsmDomAttribute;
+} LsmMathmlAttribute;
 
 typedef struct {
 	GHashTable *attribute_hash;
 	GHashTable *bag_hash;
-} LsmDomAttributeMap;
+} LsmMathmlAttributeMap;
 
 typedef struct {
-} LsmDomAttributeBag;
+} LsmMathmlAttributeBag;
 
 typedef struct {
 	void * 			(*init) 	(void);
 	void 			(*finalize) 	(void *bag);
-} LsmDomAttributeBagClass;
+} LsmMathmlAttributeBagClass;
 
 typedef struct {
 	void (*finalize) (void *attribute);
-} LsmDomAttributeClass;
+} LsmMathmlAttributeClass;
 
-typedef void (*LsmDomAttributeFinalizeFunc) (void *);
+typedef void (*LsmMathmlAttributeFinalizeFunc) (void *);
 
-LsmDomAttributeMap *	lsm_dom_attribute_map_new 		(void);
-LsmDomAttributeMap *	lsm_dom_attribute_map_duplicate		(const LsmDomAttributeMap *from);
-void			lsm_dom_attribute_map_free		(LsmDomAttributeMap *map);
+LsmMathmlAttributeMap *	lsm_mathml_attribute_map_new 		(void);
+LsmMathmlAttributeMap *	lsm_mathml_attribute_map_duplicate		(const LsmMathmlAttributeMap *from);
+void			lsm_mathml_attribute_map_free		(LsmMathmlAttributeMap *map);
 
-void 		lsm_dom_attribute_map_add_bag_attribute  	(LsmDomAttributeMap *map,
+void 		lsm_mathml_attribute_map_add_bag_attribute  	(LsmMathmlAttributeMap *map,
 								 const char *name,
 								 ptrdiff_t attribute_offset,
-								 const LsmDomAttributeClass *attribute_class,
+								 const LsmMathmlAttributeClass *attribute_class,
 								 ptrdiff_t bag_offset,
-								 const LsmDomAttributeBagClass *bag_class);
-void		lsm_dom_attribute_map_add_attribute_full	(LsmDomAttributeMap *map,
+								 const LsmMathmlAttributeBagClass *bag_class);
+void		lsm_mathml_attribute_map_add_attribute_full	(LsmMathmlAttributeMap *map,
 								 char const *name,
 								 ptrdiff_t offset,
-								 const LsmDomAttributeClass *attribute_class);
-void		lsm_dom_attribute_map_add_attribute 		(LsmDomAttributeMap *map,
+								 const LsmMathmlAttributeClass *attribute_class);
+void		lsm_mathml_attribute_map_add_attribute 		(LsmMathmlAttributeMap *map,
 								 char const *name,
 								 ptrdiff_t offset);
 
-void		lsm_dom_attribute_map_free_attributes 		(LsmDomAttributeMap *map,
+void		lsm_mathml_attribute_map_free_attributes 	(LsmMathmlAttributeMap *map,
 								 void *instance);
 
-gboolean	lsm_dom_attribute_map_set_attribute		(LsmDomAttributeMap *map,
+gboolean	lsm_mathml_attribute_map_set_attribute		(LsmMathmlAttributeMap *map,
 								 void *instance,
 								 char const *name,
 								 char const *value);
-char const *	lsm_dom_attribute_map_get_attribute		(LsmDomAttributeMap *map,
+char const *	lsm_mathml_attribute_map_get_attribute		(LsmMathmlAttributeMap *map,
 								 void *instance,
 								 char const *name);
-gboolean	lsm_dom_attribute_map_set_css_attribute		(LsmDomAttributeMap *map,
+gboolean	lsm_mathml_attribute_map_set_css_attribute	(LsmMathmlAttributeMap *map,
 								 void *instance,
 								 char const *name,
 								 char const *value,
 								 LsmDomCssType css_type);
-gboolean	lsm_dom_attribute_map_is_attribute_defined	(LsmDomAttributeMap *map,
+gboolean	lsm_mathml_attribute_map_is_attribute_defined	(LsmMathmlAttributeMap *map,
 								 void *instance,
 								 char const *name);
 
-gboolean 	lsm_dom_attribute_is_defined 			(const LsmDomAttribute *attribute);
-char const * 	lsm_dom_attribute_get_value 			(const LsmDomAttribute *attribute);
+gboolean 	lsm_mathml_attribute_is_defined 		(const LsmMathmlAttribute *attribute);
+char const * 	lsm_mathml_attribute_get_value 			(const LsmMathmlAttribute *attribute);
 
 typedef struct {
-	LsmDomAttribute attr;
+	LsmMathmlAttribute attr;
 	gboolean value;
 } LsmDomBooleanAttribute;
 
 typedef struct {
-	LsmDomAttribute attr;
+	LsmMathmlAttribute attr;
 	unsigned int value;
 } LsmDomUnsignedAttribute;
 
 typedef struct {
-	LsmDomAttribute attr;
+	LsmMathmlAttribute attr;
 	double value;
 } LsmDomDoubleAttribute;
 
 typedef struct {
-	LsmDomAttribute attr;
+	LsmMathmlAttribute attr;
 	char *value;
 } LsmDomStringAttribute;
 
 typedef struct {
-	LsmDomAttribute attr;
+	LsmMathmlAttribute attr;
 	unsigned int value;
 } LsmDomEnumAttribute;
 
@@ -132,7 +132,7 @@ typedef struct {
 } LsmDomEnumList;
 
 typedef struct {
-	LsmDomAttribute attr;
+	LsmMathmlAttribute attr;
 	unsigned int n_values;
 	unsigned int *values;
 } LsmDomEnumListAttribute;
@@ -158,10 +158,10 @@ void	lsm_dom_string_attribute_finalize	(void *abstract);
 void 	lsm_dom_enum_list_attribute_finalize 	(void *abstract);
 
 
-void 	lsm_dom_attribute_map_add_string 	(LsmDomAttributeMap *map,
+void 	lsm_mathml_attribute_map_add_string 	(LsmMathmlAttributeMap *map,
 						 char const *name,
 						 ptrdiff_t offset);
-void 	lsm_dom_attribute_map_add_enum_list 	(LsmDomAttributeMap *map,
+void 	lsm_mathml_attribute_map_add_enum_list 	(LsmMathmlAttributeMap *map,
 						 char const *name,
 						 ptrdiff_t offset);
 
@@ -214,29 +214,29 @@ typedef struct {
 double 	lsm_mathml_length_compute 	(const LsmMathmlLength *length, double default_value, double font_size);
 
 typedef struct {
-	LsmDomAttribute attr;
+	LsmMathmlAttribute attr;
 	int value;
 } LsmMathmlScriptLevelAttribute;
 
 typedef struct {
-	LsmDomAttribute attr;
+	LsmMathmlAttribute attr;
 	LsmMathmlColor color;
 } LsmMathmlColorAttribute;
 
 typedef struct {
-	LsmDomAttribute attr;
+	LsmMathmlAttribute attr;
 	LsmMathmlLength length;
 	double value;
 } LsmMathmlLengthAttribute;
 
 typedef struct {
-	LsmDomAttribute attr;
+	LsmMathmlAttribute attr;
 	LsmMathmlSpace space;
 	double value;
 } LsmMathmlSpaceAttribute;
 
 typedef struct {
-	LsmDomAttribute attr;
+	LsmMathmlAttribute attr;
 	LsmMathmlSpaceList *space_list;
 	double *values;
 } LsmMathmlSpaceListAttribute;
@@ -281,7 +281,7 @@ void 	lsm_mathml_column_align_list_attribute_parse 	(LsmDomEnumListAttribute *at
 void 	lsm_mathml_line_list_attribute_parse 		(LsmDomEnumListAttribute *attribute,
 							 LsmDomEnumList *style_value);
 
-void 	lsm_dom_attribute_map_add_space_list 		(LsmDomAttributeMap *map,
+void 	lsm_mathml_attribute_map_add_space_list 		(LsmMathmlAttributeMap *map,
 							 char const *name,
 							 ptrdiff_t offset);
 G_END_DECLS
diff --git a/src/lsmmathmlelement.c b/src/lsmmathmlelement.c
index d334b85..ce1c96f 100644
--- a/src/lsmmathmlelement.c
+++ b/src/lsmmathmlelement.c
@@ -68,7 +68,7 @@ lsm_mathml_element_set_attribute (LsmDomElement *self, const char* name, const c
 {
 	LsmMathmlElementClass *m_element_class = LSM_MATHML_ELEMENT_GET_CLASS(self);
 
-	lsm_dom_attribute_map_set_attribute (m_element_class->attributes, self,
+	lsm_mathml_attribute_map_set_attribute (m_element_class->attributes, self,
 					     name, value);
 }
 
@@ -77,7 +77,7 @@ lsm_mathml_element_get_attribute (LsmDomElement *self, const char *name)
 {
 	LsmMathmlElementClass *m_element_class = LSM_MATHML_ELEMENT_GET_CLASS(self);
 
-	return lsm_dom_attribute_map_get_attribute (m_element_class->attributes, self, name);
+	return lsm_mathml_attribute_map_get_attribute (m_element_class->attributes, self, name);
 }
 
 /* LsmMathmlElement implementation */
@@ -413,7 +413,7 @@ lsm_mathml_element_finalize (GObject *object)
 	LsmMathmlElementClass *m_element_class = LSM_MATHML_ELEMENT_GET_CLASS (object);
 	LsmMathmlElement *m_element = LSM_MATHML_ELEMENT (object);
 
-	lsm_dom_attribute_map_free_attributes (m_element_class->attributes, object);
+	lsm_mathml_attribute_map_free_attributes (m_element_class->attributes, object);
 
 	g_free (m_element->style.math_family);
 
@@ -448,13 +448,13 @@ lsm_mathml_element_class_init (LsmMathmlElementClass *m_element_class)
 	m_element_class->get_embellished_core = _get_embellished_core;
 	m_element_class->is_inferred_row = _is_inferred_row;
 
-	m_element_class->attributes = lsm_dom_attribute_map_new ();
+	m_element_class->attributes = lsm_mathml_attribute_map_new ();
 
-	lsm_dom_attribute_map_add_attribute (m_element_class->attributes, "class",
+	lsm_mathml_attribute_map_add_attribute (m_element_class->attributes, "class",
 					  offsetof (LsmMathmlElement, class_name));
-	lsm_dom_attribute_map_add_attribute (m_element_class->attributes, "id",
+	lsm_mathml_attribute_map_add_attribute (m_element_class->attributes, "id",
 					  offsetof (LsmMathmlElement, id));
-	lsm_dom_attribute_map_add_attribute (m_element_class->attributes, "href",
+	lsm_mathml_attribute_map_add_attribute (m_element_class->attributes, "href",
 					  offsetof (LsmMathmlElement, href));
 }
 
diff --git a/src/lsmmathmlelement.h b/src/lsmmathmlelement.h
index b0fd971..d7f5f24 100644
--- a/src/lsmmathmlelement.h
+++ b/src/lsmmathmlelement.h
@@ -51,9 +51,9 @@ typedef struct _LsmMathmlElementClass LsmMathmlElementClass;
 struct _LsmMathmlElement {
 	LsmDomElement	element;
 
-	LsmDomAttribute class_name;
-	LsmDomAttribute id;
-	LsmDomAttribute href;
+	LsmMathmlAttribute class_name;
+	LsmMathmlAttribute id;
+	LsmMathmlAttribute href;
 
 	LsmMathmlElementStyle style;
 
@@ -71,7 +71,7 @@ struct _LsmMathmlElement {
 struct _LsmMathmlElementClass {
 	LsmDomElementClass  parent_class;
 
-	LsmDomAttributeMap *attributes;
+	LsmMathmlAttributeMap *attributes;
 
 	void				(*update)		(LsmMathmlElement *element, LsmMathmlStyle *style);
 	gboolean			(*update_children)	(LsmMathmlElement *element, LsmMathmlStyle *style);
diff --git a/src/lsmmathmlfencedelement.c b/src/lsmmathmlfencedelement.c
index 107bf19..e47f747 100644
--- a/src/lsmmathmlfencedelement.c
+++ b/src/lsmmathmlfencedelement.c
@@ -159,13 +159,13 @@ lsm_mathml_fenced_element_class_init (LsmMathmlFencedElementClass *m_fenced_elem
 	m_element_class->layout =  lsm_mathml_fenced_element_layout;
 	m_element_class->render =  lsm_mathml_fenced_element_render;
 
-	m_element_class->attributes = lsm_dom_attribute_map_duplicate (m_element_class->attributes);
+	m_element_class->attributes = lsm_mathml_attribute_map_duplicate (m_element_class->attributes);
 
-	lsm_dom_attribute_map_add_string (m_element_class->attributes, "open",
+	lsm_mathml_attribute_map_add_string (m_element_class->attributes, "open",
 				       offsetof (LsmMathmlFencedElement, open));
-	lsm_dom_attribute_map_add_string (m_element_class->attributes, "close",
+	lsm_mathml_attribute_map_add_string (m_element_class->attributes, "close",
 				       offsetof (LsmMathmlFencedElement, close));
-	lsm_dom_attribute_map_add_string (m_element_class->attributes, "separators",
+	lsm_mathml_attribute_map_add_string (m_element_class->attributes, "separators",
 				       offsetof (LsmMathmlFencedElement, separators));
 }
 
diff --git a/src/lsmmathmlfractionelement.c b/src/lsmmathmlfractionelement.c
index 8a5bc7b..90dc70e 100644
--- a/src/lsmmathmlfractionelement.c
+++ b/src/lsmmathmlfractionelement.c
@@ -216,11 +216,11 @@ lsm_mathml_fraction_element_class_init (LsmMathmlFractionElementClass *fraction_
 	m_element_class->get_embellished_core = lsm_mathml_fraction_element_get_embellished_core;
 	m_element_class->is_inferred_row = NULL;
 
-	m_element_class->attributes = lsm_dom_attribute_map_duplicate (m_element_class->attributes);
+	m_element_class->attributes = lsm_mathml_attribute_map_duplicate (m_element_class->attributes);
 
-	lsm_dom_attribute_map_add_attribute (m_element_class->attributes, "linethickness",
+	lsm_mathml_attribute_map_add_attribute (m_element_class->attributes, "linethickness",
 					  offsetof (LsmMathmlFractionElement, line_thickness));
-	lsm_dom_attribute_map_add_attribute (m_element_class->attributes, "bevelled",
+	lsm_mathml_attribute_map_add_attribute (m_element_class->attributes, "bevelled",
 					  offsetof (LsmMathmlFractionElement, bevelled));
 }
 
diff --git a/src/lsmmathmlmathelement.c b/src/lsmmathmlmathelement.c
index 6bceccf..f893d26 100644
--- a/src/lsmmathmlmathelement.c
+++ b/src/lsmmathmlmathelement.c
@@ -202,11 +202,11 @@ lsm_mathml_math_element_class_init (LsmMathmlMathElementClass *math_class)
 
 	m_element_class->update = _update;
 
-	m_element_class->attributes = lsm_dom_attribute_map_duplicate (m_element_class->attributes);
+	m_element_class->attributes = lsm_mathml_attribute_map_duplicate (m_element_class->attributes);
 
-	lsm_dom_attribute_map_add_attribute (m_element_class->attributes, "mode",
+	lsm_mathml_attribute_map_add_attribute (m_element_class->attributes, "mode",
 					  offsetof (LsmMathmlMathElement, mode));
-	lsm_dom_attribute_map_add_attribute (m_element_class->attributes, "display",
+	lsm_mathml_attribute_map_add_attribute (m_element_class->attributes, "display",
 					  offsetof (LsmMathmlMathElement, display));
 }
 
diff --git a/src/lsmmathmloperatorelement.c b/src/lsmmathmloperatorelement.c
index edb33d1..8dc197f 100644
--- a/src/lsmmathmloperatorelement.c
+++ b/src/lsmmathmloperatorelement.c
@@ -236,31 +236,31 @@ lsm_mathml_operator_element_class_init (LsmMathmlOperatorElementClass *operator_
 	m_element_class->render = lsm_mathml_operator_element_render;
 	m_element_class->get_embellished_core = lsm_mathml_operator_element_get_embellished_core;
 
-	m_element_class->attributes = lsm_dom_attribute_map_duplicate (m_element_class->attributes);
+	m_element_class->attributes = lsm_mathml_attribute_map_duplicate (m_element_class->attributes);
 
-	lsm_dom_attribute_map_add_attribute (m_element_class->attributes, "form",
+	lsm_mathml_attribute_map_add_attribute (m_element_class->attributes, "form",
 					  offsetof (LsmMathmlOperatorElement, form));
-	lsm_dom_attribute_map_add_attribute (m_element_class->attributes, "fence",
+	lsm_mathml_attribute_map_add_attribute (m_element_class->attributes, "fence",
 					  offsetof (LsmMathmlOperatorElement, fence));
-	lsm_dom_attribute_map_add_attribute (m_element_class->attributes, "separator",
+	lsm_mathml_attribute_map_add_attribute (m_element_class->attributes, "separator",
 					  offsetof (LsmMathmlOperatorElement, separator));
-	lsm_dom_attribute_map_add_attribute (m_element_class->attributes, "lspace",
+	lsm_mathml_attribute_map_add_attribute (m_element_class->attributes, "lspace",
 					  offsetof (LsmMathmlOperatorElement, left_space));
-	lsm_dom_attribute_map_add_attribute (m_element_class->attributes, "rspace",
+	lsm_mathml_attribute_map_add_attribute (m_element_class->attributes, "rspace",
 					  offsetof (LsmMathmlOperatorElement, right_space));
-	lsm_dom_attribute_map_add_attribute (m_element_class->attributes, "stretchy",
+	lsm_mathml_attribute_map_add_attribute (m_element_class->attributes, "stretchy",
 					  offsetof (LsmMathmlOperatorElement, stretchy));
-	lsm_dom_attribute_map_add_attribute (m_element_class->attributes, "symmetric",
+	lsm_mathml_attribute_map_add_attribute (m_element_class->attributes, "symmetric",
 					  offsetof (LsmMathmlOperatorElement, symmetric));
-	lsm_dom_attribute_map_add_attribute (m_element_class->attributes, "accent",
+	lsm_mathml_attribute_map_add_attribute (m_element_class->attributes, "accent",
 					  offsetof (LsmMathmlOperatorElement, accent));
-	lsm_dom_attribute_map_add_attribute (m_element_class->attributes, "minsize",
+	lsm_mathml_attribute_map_add_attribute (m_element_class->attributes, "minsize",
 					  offsetof (LsmMathmlOperatorElement, min_size));
-	lsm_dom_attribute_map_add_attribute (m_element_class->attributes, "maxsize",
+	lsm_mathml_attribute_map_add_attribute (m_element_class->attributes, "maxsize",
 					  offsetof (LsmMathmlOperatorElement, max_size));
-	lsm_dom_attribute_map_add_attribute (m_element_class->attributes, "largeop",
+	lsm_mathml_attribute_map_add_attribute (m_element_class->attributes, "largeop",
 					  offsetof (LsmMathmlOperatorElement, large_op));
-	lsm_dom_attribute_map_add_attribute (m_element_class->attributes, "movablelimits",
+	lsm_mathml_attribute_map_add_attribute (m_element_class->attributes, "movablelimits",
 					  offsetof (LsmMathmlOperatorElement, movable_limits));
 }
 
diff --git a/src/lsmmathmlpresentationtoken.c b/src/lsmmathmlpresentationtoken.c
index 4006f69..e607740 100644
--- a/src/lsmmathmlpresentationtoken.c
+++ b/src/lsmmathmlpresentationtoken.c
@@ -223,30 +223,30 @@ lsm_mathml_presentation_token_class_init (LsmMathmlPresentationTokenClass *m_tok
 
 	m_token_class->get_text = _get_text;
 
-	m_element_class->attributes = lsm_dom_attribute_map_duplicate (m_element_class->attributes);
+	m_element_class->attributes = lsm_mathml_attribute_map_duplicate (m_element_class->attributes);
 
-	lsm_dom_attribute_map_add_string (m_element_class->attributes, "mathfamily",
+	lsm_mathml_attribute_map_add_string (m_element_class->attributes, "mathfamily",
 					  offsetof (LsmMathmlPresentationToken, math_family));
-	lsm_dom_attribute_map_add_attribute (m_element_class->attributes, "mathvariant",
+	lsm_mathml_attribute_map_add_attribute (m_element_class->attributes, "mathvariant",
 					     offsetof (LsmMathmlPresentationToken, math_variant));
-	lsm_dom_attribute_map_add_attribute (m_element_class->attributes, "mathsize",
+	lsm_mathml_attribute_map_add_attribute (m_element_class->attributes, "mathsize",
 					     offsetof (LsmMathmlPresentationToken, math_size));
-	lsm_dom_attribute_map_add_attribute (m_element_class->attributes, "mathcolor",
+	lsm_mathml_attribute_map_add_attribute (m_element_class->attributes, "mathcolor",
 					     offsetof (LsmMathmlPresentationToken, math_color));
-	lsm_dom_attribute_map_add_attribute (m_element_class->attributes, "mathbackground",
+	lsm_mathml_attribute_map_add_attribute (m_element_class->attributes, "mathbackground",
 					     offsetof (LsmMathmlPresentationToken, math_background));
 
 	/* Deprecated attributes */
 
-	lsm_dom_attribute_map_add_string (m_element_class->attributes, "fontfamily",
+	lsm_mathml_attribute_map_add_string (m_element_class->attributes, "fontfamily",
 					  offsetof (LsmMathmlPresentationToken, math_family));
-	lsm_dom_attribute_map_add_attribute (m_element_class->attributes, "fontsize",
+	lsm_mathml_attribute_map_add_attribute (m_element_class->attributes, "fontsize",
 					     offsetof (LsmMathmlPresentationToken, math_size));
-	lsm_dom_attribute_map_add_attribute (m_element_class->attributes, "color",
+	lsm_mathml_attribute_map_add_attribute (m_element_class->attributes, "color",
 					     offsetof (LsmMathmlPresentationToken, math_color));
-	lsm_dom_attribute_map_add_attribute (m_element_class->attributes, "fontweight",
+	lsm_mathml_attribute_map_add_attribute (m_element_class->attributes, "fontweight",
 					     offsetof (LsmMathmlPresentationToken, font_weight));
-	lsm_dom_attribute_map_add_attribute (m_element_class->attributes, "fontstyle",
+	lsm_mathml_attribute_map_add_attribute (m_element_class->attributes, "fontstyle",
 					     offsetof (LsmMathmlPresentationToken, font_style));
 }
 
diff --git a/src/lsmmathmlspaceelement.c b/src/lsmmathmlspaceelement.c
index a581280..4aa6ad0 100644
--- a/src/lsmmathmlspaceelement.c
+++ b/src/lsmmathmlspaceelement.c
@@ -117,13 +117,13 @@ lsm_mathml_space_element_class_init (LsmMathmlSpaceElementClass *space_class)
 	m_element_class->layout = lsm_mathml_space_element_layout;
 	m_element_class->is_inferred_row = NULL;
 
-	m_element_class->attributes = lsm_dom_attribute_map_duplicate (m_element_class->attributes);
+	m_element_class->attributes = lsm_mathml_attribute_map_duplicate (m_element_class->attributes);
 
-	lsm_dom_attribute_map_add_attribute (m_element_class->attributes, "width",
+	lsm_mathml_attribute_map_add_attribute (m_element_class->attributes, "width",
 					  offsetof (LsmMathmlSpaceElement, width));
-	lsm_dom_attribute_map_add_attribute (m_element_class->attributes, "height",
+	lsm_mathml_attribute_map_add_attribute (m_element_class->attributes, "height",
 					  offsetof (LsmMathmlSpaceElement, height));
-	lsm_dom_attribute_map_add_attribute (m_element_class->attributes, "depth",
+	lsm_mathml_attribute_map_add_attribute (m_element_class->attributes, "depth",
 					  offsetof (LsmMathmlSpaceElement, depth));
 }
 
diff --git a/src/lsmmathmlstringelement.c b/src/lsmmathmlstringelement.c
index 57efb6b..e0d2c51 100644
--- a/src/lsmmathmlstringelement.c
+++ b/src/lsmmathmlstringelement.c
@@ -103,11 +103,11 @@ lsm_mathml_string_element_class_init (LsmMathmlStringElementClass *string_class)
 
 	m_token_class->get_text = lsm_mathml_string_element_get_text;
 
-	m_element_class->attributes = lsm_dom_attribute_map_duplicate (m_element_class->attributes);
+	m_element_class->attributes = lsm_mathml_attribute_map_duplicate (m_element_class->attributes);
 
-	lsm_dom_attribute_map_add_string (m_element_class->attributes, "lquote",
+	lsm_mathml_attribute_map_add_string (m_element_class->attributes, "lquote",
 				       offsetof (LsmMathmlStringElement, left_quote));
-	lsm_dom_attribute_map_add_string (m_element_class->attributes, "rquote",
+	lsm_mathml_attribute_map_add_string (m_element_class->attributes, "rquote",
 				       offsetof (LsmMathmlStringElement, right_quote));
 }
 
diff --git a/src/lsmmathmlstyleelement.c b/src/lsmmathmlstyleelement.c
index a60d59d..8c63eab 100644
--- a/src/lsmmathmlstyleelement.c
+++ b/src/lsmmathmlstyleelement.c
@@ -135,58 +135,58 @@ lsm_mathml_style_element_class_init (LsmMathmlStyleElementClass *style_class)
 
 	m_element_class->update = lsm_mathml_style_element_update;
 
-	m_element_class->attributes = lsm_dom_attribute_map_duplicate (m_element_class->attributes);
+	m_element_class->attributes = lsm_mathml_attribute_map_duplicate (m_element_class->attributes);
 
-	lsm_dom_attribute_map_add_attribute (m_element_class->attributes, "scriptlevel",
+	lsm_mathml_attribute_map_add_attribute (m_element_class->attributes, "scriptlevel",
 					  offsetof (LsmMathmlStyleElement, script_level));
-	lsm_dom_attribute_map_add_attribute (m_element_class->attributes, "displaystyle",
+	lsm_mathml_attribute_map_add_attribute (m_element_class->attributes, "displaystyle",
 					  offsetof (LsmMathmlStyleElement, display_style));
-	lsm_dom_attribute_map_add_attribute (m_element_class->attributes, "scriptsizemultiplier",
+	lsm_mathml_attribute_map_add_attribute (m_element_class->attributes, "scriptsizemultiplier",
 					  offsetof (LsmMathmlStyleElement, script_size_multiplier));
-	lsm_dom_attribute_map_add_attribute (m_element_class->attributes, "scriptminsize",
+	lsm_mathml_attribute_map_add_attribute (m_element_class->attributes, "scriptminsize",
 					  offsetof (LsmMathmlStyleElement, script_min_size));
-	lsm_dom_attribute_map_add_attribute (m_element_class->attributes, "background",
+	lsm_mathml_attribute_map_add_attribute (m_element_class->attributes, "background",
 					  offsetof (LsmMathmlStyleElement, math_background));
-	lsm_dom_attribute_map_add_attribute (m_element_class->attributes, "veryverythinmathspace",
+	lsm_mathml_attribute_map_add_attribute (m_element_class->attributes, "veryverythinmathspace",
 					  offsetof (LsmMathmlStyleElement, very_very_thin_math_space));
-	lsm_dom_attribute_map_add_attribute (m_element_class->attributes, "verythinmathspace",
+	lsm_mathml_attribute_map_add_attribute (m_element_class->attributes, "verythinmathspace",
 					  offsetof (LsmMathmlStyleElement, very_thin_math_space));
-	lsm_dom_attribute_map_add_attribute (m_element_class->attributes, "thinmathspace",
+	lsm_mathml_attribute_map_add_attribute (m_element_class->attributes, "thinmathspace",
 					  offsetof (LsmMathmlStyleElement, thin_math_space));
-	lsm_dom_attribute_map_add_attribute (m_element_class->attributes, "mediummathspace",
+	lsm_mathml_attribute_map_add_attribute (m_element_class->attributes, "mediummathspace",
 					  offsetof (LsmMathmlStyleElement, medium_math_space));
-	lsm_dom_attribute_map_add_attribute (m_element_class->attributes, "thickmathspace",
+	lsm_mathml_attribute_map_add_attribute (m_element_class->attributes, "thickmathspace",
 					  offsetof (LsmMathmlStyleElement, thick_math_space));
-	lsm_dom_attribute_map_add_attribute (m_element_class->attributes, "verythickmathspace",
+	lsm_mathml_attribute_map_add_attribute (m_element_class->attributes, "verythickmathspace",
 					  offsetof (LsmMathmlStyleElement, very_thick_math_space));
-	lsm_dom_attribute_map_add_attribute (m_element_class->attributes, "veryverythickmathspace",
+	lsm_mathml_attribute_map_add_attribute (m_element_class->attributes, "veryverythickmathspace",
 					  offsetof (LsmMathmlStyleElement, very_very_thick_math_space));
 
-	lsm_dom_attribute_map_add_string (m_element_class->attributes, "mathfamily",
+	lsm_mathml_attribute_map_add_string (m_element_class->attributes, "mathfamily",
 				       offsetof (LsmMathmlStyleElement, math_family));
-	lsm_dom_attribute_map_add_attribute (m_element_class->attributes, "mathvariant",
+	lsm_mathml_attribute_map_add_attribute (m_element_class->attributes, "mathvariant",
 					  offsetof (LsmMathmlStyleElement, math_variant));
-	lsm_dom_attribute_map_add_attribute (m_element_class->attributes, "mathsize",
+	lsm_mathml_attribute_map_add_attribute (m_element_class->attributes, "mathsize",
 					  offsetof (LsmMathmlStyleElement, math_size));
-	lsm_dom_attribute_map_add_attribute (m_element_class->attributes, "mathcolor",
+	lsm_mathml_attribute_map_add_attribute (m_element_class->attributes, "mathcolor",
 					  offsetof (LsmMathmlStyleElement, math_color));
-	lsm_dom_attribute_map_add_attribute (m_element_class->attributes, "mathbackground",
+	lsm_mathml_attribute_map_add_attribute (m_element_class->attributes, "mathbackground",
 					  offsetof (LsmMathmlStyleElement, math_background));
 
-	lsm_dom_attribute_map_add_attribute (m_element_class->attributes, "linethickness",
+	lsm_mathml_attribute_map_add_attribute (m_element_class->attributes, "linethickness",
 					  offsetof (LsmMathmlStyleElement, line_thickness));
 
 	/* Deprecated attributes */
 
-	lsm_dom_attribute_map_add_string (m_element_class->attributes, "fontfamily",
+	lsm_mathml_attribute_map_add_string (m_element_class->attributes, "fontfamily",
 				       offsetof (LsmMathmlStyleElement, math_family));
-	lsm_dom_attribute_map_add_attribute (m_element_class->attributes, "fontsize",
+	lsm_mathml_attribute_map_add_attribute (m_element_class->attributes, "fontsize",
 					  offsetof (LsmMathmlStyleElement, math_size));
-	lsm_dom_attribute_map_add_attribute (m_element_class->attributes, "color",
+	lsm_mathml_attribute_map_add_attribute (m_element_class->attributes, "color",
 					  offsetof (LsmMathmlStyleElement, math_color));
-	lsm_dom_attribute_map_add_attribute (m_element_class->attributes, "fontweight",
+	lsm_mathml_attribute_map_add_attribute (m_element_class->attributes, "fontweight",
 					  offsetof (LsmMathmlStyleElement, font_weight));
-	lsm_dom_attribute_map_add_attribute (m_element_class->attributes, "fontstyle",
+	lsm_mathml_attribute_map_add_attribute (m_element_class->attributes, "fontstyle",
 					  offsetof (LsmMathmlStyleElement, font_style));
 }
 
diff --git a/src/lsmmathmltablecellelement.c b/src/lsmmathmltablecellelement.c
index 1a8a698..bd9fd24 100644
--- a/src/lsmmathmltablecellelement.c
+++ b/src/lsmmathmltablecellelement.c
@@ -109,11 +109,11 @@ lsm_mathml_table_cell_element_class_init (LsmMathmlTableCellElementClass *table_
 	m_element_class->measure = lsm_mathml_table_cell_element_measure;
 	m_element_class->layout = lsm_mathml_table_cell_element_layout;
 
-	m_element_class->attributes = lsm_dom_attribute_map_duplicate (m_element_class->attributes);
+	m_element_class->attributes = lsm_mathml_attribute_map_duplicate (m_element_class->attributes);
 
-	lsm_dom_attribute_map_add_attribute (m_element_class->attributes, "rowspan",
+	lsm_mathml_attribute_map_add_attribute (m_element_class->attributes, "rowspan",
 					  offsetof (LsmMathmlTableCellElement, row_span));
-	lsm_dom_attribute_map_add_attribute (m_element_class->attributes, "columnspan",
+	lsm_mathml_attribute_map_add_attribute (m_element_class->attributes, "columnspan",
 					  offsetof (LsmMathmlTableCellElement, column_span));
 }
 
diff --git a/src/lsmmathmltableelement.c b/src/lsmmathmltableelement.c
index 31c869a..99668fd 100644
--- a/src/lsmmathmltableelement.c
+++ b/src/lsmmathmltableelement.c
@@ -483,27 +483,27 @@ lsm_mathml_table_element_class_init (LsmMathmlTableElementClass *table_class)
 	m_element_class->render = lsm_mathml_table_element_render;
 	m_element_class->is_inferred_row = NULL;
 
-	m_element_class->attributes = lsm_dom_attribute_map_duplicate (m_element_class->attributes);
+	m_element_class->attributes = lsm_mathml_attribute_map_duplicate (m_element_class->attributes);
 
-	lsm_dom_attribute_map_add_enum_list (m_element_class->attributes, "rowalign",
+	lsm_mathml_attribute_map_add_enum_list (m_element_class->attributes, "rowalign",
 					   offsetof (LsmMathmlTableElement, row_align));
-	lsm_dom_attribute_map_add_enum_list (m_element_class->attributes, "columnalign",
+	lsm_mathml_attribute_map_add_enum_list (m_element_class->attributes, "columnalign",
 					   offsetof (LsmMathmlTableElement, column_align));
-	lsm_dom_attribute_map_add_enum_list (m_element_class->attributes, "rowspacing",
+	lsm_mathml_attribute_map_add_enum_list (m_element_class->attributes, "rowspacing",
 					   offsetof (LsmMathmlTableElement, row_spacing));
-	lsm_dom_attribute_map_add_enum_list (m_element_class->attributes, "columnspacing",
+	lsm_mathml_attribute_map_add_enum_list (m_element_class->attributes, "columnspacing",
 					   offsetof (LsmMathmlTableElement, column_spacing));
-	lsm_dom_attribute_map_add_enum_list (m_element_class->attributes, "rowlines",
+	lsm_mathml_attribute_map_add_enum_list (m_element_class->attributes, "rowlines",
 					   offsetof (LsmMathmlTableElement, row_lines));
-	lsm_dom_attribute_map_add_enum_list (m_element_class->attributes, "columnlines",
+	lsm_mathml_attribute_map_add_enum_list (m_element_class->attributes, "columnlines",
 					   offsetof (LsmMathmlTableElement, column_lines));
-	lsm_dom_attribute_map_add_attribute (m_element_class->attributes, "frame",
+	lsm_mathml_attribute_map_add_attribute (m_element_class->attributes, "frame",
 					  offsetof (LsmMathmlTableElement, frame));
-	lsm_dom_attribute_map_add_space_list (m_element_class->attributes, "framespacing",
+	lsm_mathml_attribute_map_add_space_list (m_element_class->attributes, "framespacing",
 					   offsetof (LsmMathmlTableElement, frame_spacing));
-	lsm_dom_attribute_map_add_attribute (m_element_class->attributes, "equalrows",
+	lsm_mathml_attribute_map_add_attribute (m_element_class->attributes, "equalrows",
 					  offsetof (LsmMathmlTableElement, equal_rows));
-	lsm_dom_attribute_map_add_attribute (m_element_class->attributes, "equalcolumns",
+	lsm_mathml_attribute_map_add_attribute (m_element_class->attributes, "equalcolumns",
 					  offsetof (LsmMathmlTableElement, equal_columns));
 }
 
diff --git a/src/lsmmathmlunderoverelement.c b/src/lsmmathmlunderoverelement.c
index 596bad6..a48dd23 100644
--- a/src/lsmmathmlunderoverelement.c
+++ b/src/lsmmathmlunderoverelement.c
@@ -463,11 +463,11 @@ lsm_mathml_under_over_element_class_init (LsmMathmlUnderOverElementClass *under_
 	m_element_class->get_embellished_core = lsm_mathml_under_over_element_get_embellished_core;
 	m_element_class->is_inferred_row = NULL;
 
-	m_element_class->attributes = lsm_dom_attribute_map_duplicate (m_element_class->attributes);
+	m_element_class->attributes = lsm_mathml_attribute_map_duplicate (m_element_class->attributes);
 
-	lsm_dom_attribute_map_add_attribute (m_element_class->attributes, "accent",
+	lsm_mathml_attribute_map_add_attribute (m_element_class->attributes, "accent",
 					  offsetof (LsmMathmlUnderOverElement, accent));
-	lsm_dom_attribute_map_add_attribute (m_element_class->attributes, "accentunder",
+	lsm_mathml_attribute_map_add_attribute (m_element_class->attributes, "accentunder",
 					  offsetof (LsmMathmlUnderOverElement, accent_under));
 }
 



[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]