GNOME.org
 

[lasem/mml-attrs: 3/5] [Mathml] More renames.

commit 7c11cc08d2550c1ff7d420587a4718b74b88d3a7
Author: Emmanuel Pacaud <emmanuel gnome org>
Date:   Sun Nov 15 16:52:32 2009 +0100

    [Mathml] More renames.

 src/lsmmathmlattributes.c        |   72 ++++++++++++------------
 src/lsmmathmlattributes.h        |  114 +++++++++++++++++++-------------------
 src/lsmmathmlfencedelement.c     |    6 +-
 src/lsmmathmlfencedelement.h     |    6 +-
 src/lsmmathmlfractionelement.c   |    2 +-
 src/lsmmathmlfractionelement.h   |    2 +-
 src/lsmmathmlmathelement.h       |    4 +-
 src/lsmmathmloperatorelement.c   |   20 +++---
 src/lsmmathmloperatorelement.h   |   16 +++---
 src/lsmmathmlpresentationtoken.c |    2 +-
 src/lsmmathmlpresentationtoken.h |    8 +-
 src/lsmmathmlstringelement.c     |    4 +-
 src/lsmmathmlstringelement.h     |    4 +-
 src/lsmmathmlstyleelement.c      |    6 +-
 src/lsmmathmlstyleelement.h      |   12 ++--
 src/lsmmathmltablecellelement.c  |    4 +-
 src/lsmmathmltablecellelement.h  |    4 +-
 src/lsmmathmltableelement.c      |    8 +-
 src/lsmmathmltableelement.h      |   16 +++---
 src/lsmmathmlunderoverelement.c  |    4 +-
 src/lsmmathmlunderoverelement.h  |    4 +-
 21 files changed, 159 insertions(+), 159 deletions(-)
---
diff --git a/src/lsmmathmlattributes.c b/src/lsmmathmlattributes.c
index 8a2bcea..b6cb336 100644
--- a/src/lsmmathmlattributes.c
+++ b/src/lsmmathmlattributes.c
@@ -347,7 +347,7 @@ lsm_mathml_attribute_get_value (const LsmMathmlAttribute *attribute)
 }
 
 void
-lsm_dom_boolean_attribute_parse (LsmDomBooleanAttribute *attribute,
+lsm_mathml_boolean_attribute_parse (LsmMathmlBooleanAttribute *attribute,
 				 gboolean *style_value)
 {
 	const char *string;
@@ -366,7 +366,7 @@ lsm_dom_boolean_attribute_parse (LsmDomBooleanAttribute *attribute,
 }
 
 void
-lsm_dom_unsigned_attribute_parse (LsmDomUnsignedAttribute *attribute,
+lsm_mathml_unsigned_attribute_parse (LsmMathmlUnsignedAttribute *attribute,
 				  unsigned int *style_value)
 {
 	const char *string;
@@ -385,7 +385,7 @@ lsm_dom_unsigned_attribute_parse (LsmDomUnsignedAttribute *attribute,
 }
 
 void
-lsm_dom_double_attribute_parse (LsmDomDoubleAttribute *attribute,
+lsm_mathml_double_attribute_parse (LsmMathmlDoubleAttribute *attribute,
 				double *style_value)
 {
 	const char *string;
@@ -404,7 +404,7 @@ lsm_dom_double_attribute_parse (LsmDomDoubleAttribute *attribute,
 }
 
 void
-lsm_dom_string_attribute_parse (LsmDomStringAttribute *attribute,
+lsm_mathml_string_attribute_parse (LsmMathmlStringAttribute *attribute,
 				char **style_value)
 {
 	const char *string;
@@ -426,7 +426,7 @@ lsm_dom_string_attribute_parse (LsmDomStringAttribute *attribute,
 }
 
 void
-lsm_dom_enum_attribute_parse (LsmDomEnumAttribute *attribute,
+lsm_mathml_enum_attribute_parse (LsmMathmlEnumAttribute *attribute,
 			      unsigned int *style_value,
 			      LsmDomNamedConvert convert)
 {
@@ -446,8 +446,8 @@ lsm_dom_enum_attribute_parse (LsmDomEnumAttribute *attribute,
 }
 
 void
-lsm_dom_enum_list_attribute_parse (LsmDomEnumListAttribute *attribute,
-				   LsmDomEnumList *style_value,
+lsm_mathml_enum_list_attribute_parse (LsmMathmlEnumListAttribute *attribute,
+				   LsmMathmlEnumList *style_value,
 				   LsmDomNamedConvert convert)
 {
 	const char *string;
@@ -484,9 +484,9 @@ lsm_dom_enum_list_attribute_parse (LsmDomEnumListAttribute *attribute,
 }
 
 void
-lsm_dom_string_attribute_finalize (void *abstract)
+lsm_mathml_string_attribute_finalize (void *abstract)
 {
-	LsmDomStringAttribute *attribute = abstract;
+	LsmMathmlStringAttribute *attribute = abstract;
 
 	g_return_if_fail (attribute != NULL);
 
@@ -495,9 +495,9 @@ lsm_dom_string_attribute_finalize (void *abstract)
 }
 
 void
-lsm_dom_enum_list_attribute_finalize (void *abstract)
+lsm_mathml_enum_list_attribute_finalize (void *abstract)
 {
-	LsmDomEnumListAttribute *attribute = abstract;
+	LsmMathmlEnumListAttribute *attribute = abstract;
 
 	g_return_if_fail (attribute != NULL);
 
@@ -507,7 +507,7 @@ lsm_dom_enum_list_attribute_finalize (void *abstract)
 }
 
 static const LsmMathmlAttributeClass string_attribute_class = {
-	.finalize = lsm_dom_string_attribute_finalize
+	.finalize = lsm_mathml_string_attribute_finalize
 };
 
 void
@@ -519,7 +519,7 @@ lsm_mathml_attribute_map_add_string (LsmMathmlAttributeMap *map,
 }
 
 static const LsmMathmlAttributeClass enum_list_attribute_class = {
-	.finalize = lsm_dom_enum_list_attribute_finalize
+	.finalize = lsm_mathml_enum_list_attribute_finalize
 };
 
 void
@@ -707,52 +707,52 @@ lsm_mathml_color_attribute_parse (LsmMathmlColorAttribute *attribute,
 }
 
 void
-lsm_mathml_mode_attribute_parse (LsmDomEnumAttribute *attribute,
+lsm_mathml_mode_attribute_parse (LsmMathmlEnumAttribute *attribute,
 				 unsigned int *style_value)
 {
-	return lsm_dom_enum_attribute_parse (attribute, style_value, lsm_mathml_mode_from_string);
+	return lsm_mathml_enum_attribute_parse (attribute, style_value, lsm_mathml_mode_from_string);
 }
 
 void
-lsm_mathml_display_attribute_parse (LsmDomEnumAttribute *attribute,
+lsm_mathml_display_attribute_parse (LsmMathmlEnumAttribute *attribute,
 				    unsigned int *style_value)
 {
-	return lsm_dom_enum_attribute_parse (attribute, style_value, lsm_mathml_display_from_string);
+	return lsm_mathml_enum_attribute_parse (attribute, style_value, lsm_mathml_display_from_string);
 }
 
 void
-lsm_mathml_form_attribute_parse (LsmDomEnumAttribute *attribute,
+lsm_mathml_form_attribute_parse (LsmMathmlEnumAttribute *attribute,
 				 unsigned int *style_value)
 {
-	return lsm_dom_enum_attribute_parse (attribute, style_value, lsm_mathml_form_from_string);
+	return lsm_mathml_enum_attribute_parse (attribute, style_value, lsm_mathml_form_from_string);
 }
 
 void
-lsm_mathml_font_style_attribute_parse (LsmDomEnumAttribute *attribute,
+lsm_mathml_font_style_attribute_parse (LsmMathmlEnumAttribute *attribute,
 				       unsigned int *style_value)
 {
-	return lsm_dom_enum_attribute_parse (attribute, style_value, lsm_mathml_font_style_from_string);
+	return lsm_mathml_enum_attribute_parse (attribute, style_value, lsm_mathml_font_style_from_string);
 }
 
 void
-lsm_mathml_font_weight_attribute_parse (LsmDomEnumAttribute *attribute,
+lsm_mathml_font_weight_attribute_parse (LsmMathmlEnumAttribute *attribute,
 					unsigned int *style_value)
 {
-	return lsm_dom_enum_attribute_parse (attribute, style_value, lsm_mathml_font_weight_from_string);
+	return lsm_mathml_enum_attribute_parse (attribute, style_value, lsm_mathml_font_weight_from_string);
 }
 
 void
-lsm_mathml_variant_attribute_parse (LsmDomEnumAttribute *attribute,
+lsm_mathml_variant_attribute_parse (LsmMathmlEnumAttribute *attribute,
 				    unsigned int *style_value)
 {
-	return lsm_dom_enum_attribute_parse (attribute, style_value, lsm_mathml_variant_from_string);
+	return lsm_mathml_enum_attribute_parse (attribute, style_value, lsm_mathml_variant_from_string);
 }
 
 void
-lsm_mathml_line_attribute_parse (LsmDomEnumAttribute *attribute,
+lsm_mathml_line_attribute_parse (LsmMathmlEnumAttribute *attribute,
 				 unsigned int *style_value)
 {
-	return lsm_dom_enum_attribute_parse (attribute, style_value, lsm_mathml_line_from_string);
+	return lsm_mathml_enum_attribute_parse (attribute, style_value, lsm_mathml_line_from_string);
 }
 
 void
@@ -1082,24 +1082,24 @@ lsm_mathml_space_list_attribute_parse (LsmMathmlSpaceListAttribute *attribute,
 }
 
 void
-lsm_mathml_row_align_list_attribute_parse (LsmDomEnumListAttribute *attribute,
-					   LsmDomEnumList *style_value)
+lsm_mathml_row_align_list_attribute_parse (LsmMathmlEnumListAttribute *attribute,
+					   LsmMathmlEnumList *style_value)
 {
-	lsm_dom_enum_list_attribute_parse (attribute, style_value, lsm_mathml_row_align_from_string);
+	lsm_mathml_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)
+lsm_mathml_column_align_list_attribute_parse (LsmMathmlEnumListAttribute *attribute,
+					      LsmMathmlEnumList *style_value)
 {
-	lsm_dom_enum_list_attribute_parse (attribute, style_value, lsm_mathml_column_align_from_string);
+	lsm_mathml_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)
+lsm_mathml_line_list_attribute_parse (LsmMathmlEnumListAttribute *attribute,
+				      LsmMathmlEnumList *style_value)
 {
-	lsm_dom_enum_list_attribute_parse (attribute, style_value, lsm_mathml_line_from_string);
+	lsm_mathml_enum_list_attribute_parse (attribute, style_value, lsm_mathml_line_from_string);
 }
 
 static const LsmMathmlAttributeClass space_list_attribute_class = {
diff --git a/src/lsmmathmlattributes.h b/src/lsmmathmlattributes.h
index ffc1688..887bf1a 100644
--- a/src/lsmmathmlattributes.h
+++ b/src/lsmmathmlattributes.h
@@ -101,77 +101,51 @@ gboolean	lsm_mathml_attribute_map_is_attribute_defined	(LsmMathmlAttributeMap *m
 gboolean 	lsm_mathml_attribute_is_defined 		(const LsmMathmlAttribute *attribute);
 char const * 	lsm_mathml_attribute_get_value 			(const LsmMathmlAttribute *attribute);
 
+typedef unsigned int (*LsmDomNamedConvert) (const char *string);
+
+#define LSM_MATHML_SPACE_EM_VERY_VERY_THIN	0.055556
+#define LSM_MATHML_SPACE_EM_VERY_THIN		0.111111
+#define LSM_MATHML_SPACE_EM_THIN		0.166667
+#define LSM_MATHML_SPACE_EM_MEDIUM	 	0.222222
+#define LSM_MATHML_SPACE_EM_THICK		0.277778
+#define LSM_MATHML_SPACE_EM_VERY_THICK		0.333333
+#define LSM_MATHML_SPACE_EM_VERY_VERY_THICK	0.388889
+
 typedef struct {
 	LsmMathmlAttribute attr;
 	gboolean value;
-} LsmDomBooleanAttribute;
+} LsmMathmlBooleanAttribute;
 
 typedef struct {
 	LsmMathmlAttribute attr;
 	unsigned int value;
-} LsmDomUnsignedAttribute;
+} LsmMathmlUnsignedAttribute;
 
 typedef struct {
 	LsmMathmlAttribute attr;
 	double value;
-} LsmDomDoubleAttribute;
+} LsmMathmlDoubleAttribute;
 
 typedef struct {
 	LsmMathmlAttribute attr;
 	char *value;
-} LsmDomStringAttribute;
+} LsmMathmlStringAttribute;
 
 typedef struct {
 	LsmMathmlAttribute attr;
 	unsigned int value;
-} LsmDomEnumAttribute;
+} LsmMathmlEnumAttribute;
 
 typedef struct {
 	unsigned int n_values;
 	unsigned int *values;
-} LsmDomEnumList;
+} LsmMathmlEnumList;
 
 typedef struct {
 	LsmMathmlAttribute attr;
 	unsigned int n_values;
 	unsigned int *values;
-} LsmDomEnumListAttribute;
-
-typedef unsigned int (*LsmDomNamedConvert) (const char *string);
-
-void 	lsm_dom_boolean_attribute_parse		(LsmDomBooleanAttribute *attribute,
-						 gboolean *default_value);
-void 	lsm_dom_unsigned_attribute_parse	(LsmDomUnsignedAttribute *attribute,
-						 unsigned *default_value);
-void 	lsm_dom_double_attribute_parse		(LsmDomDoubleAttribute *attribute,
-						 double *default_value);
-void	lsm_dom_string_attribute_parse		(LsmDomStringAttribute *attribute,
-						 char **default_value);
-void 	lsm_dom_enum_attribute_parse 		(LsmDomEnumAttribute *attribute,
-						 unsigned int *default_value,
-						 LsmDomNamedConvert convert);
-void 	lsm_dom_enum_list_attribute_parse 	(LsmDomEnumListAttribute *attribute,
-						 LsmDomEnumList *style_value,
-						 LsmDomNamedConvert convert);
-
-void	lsm_dom_string_attribute_finalize	(void *abstract);
-void 	lsm_dom_enum_list_attribute_finalize 	(void *abstract);
-
-
-void 	lsm_mathml_attribute_map_add_string 	(LsmMathmlAttributeMap *map,
-						 char const *name,
-						 ptrdiff_t offset);
-void 	lsm_mathml_attribute_map_add_enum_list 	(LsmMathmlAttributeMap *map,
-						 char const *name,
-						 ptrdiff_t offset);
-
-#define LSM_MATHML_SPACE_EM_VERY_VERY_THIN	0.055556
-#define LSM_MATHML_SPACE_EM_VERY_THIN		0.111111
-#define LSM_MATHML_SPACE_EM_THIN		0.166667
-#define LSM_MATHML_SPACE_EM_MEDIUM	 	0.222222
-#define LSM_MATHML_SPACE_EM_THICK		0.277778
-#define LSM_MATHML_SPACE_EM_VERY_THICK		0.333333
-#define LSM_MATHML_SPACE_EM_VERY_VERY_THICK	0.388889
+} LsmMathmlEnumListAttribute;
 
 GType lsm_mathml_color_get_type (void);
 
@@ -241,21 +215,47 @@ typedef struct {
 	double *values;
 } LsmMathmlSpaceListAttribute;
 
+void 		lsm_mathml_boolean_attribute_parse	(LsmMathmlBooleanAttribute *attribute,
+							 gboolean *default_value);
+void 		lsm_mathml_unsigned_attribute_parse	(LsmMathmlUnsignedAttribute *attribute,
+							 unsigned *default_value);
+void 		lsm_mathml_double_attribute_parse	(LsmMathmlDoubleAttribute *attribute,
+							 double *default_value);
+void		lsm_mathml_string_attribute_parse	(LsmMathmlStringAttribute *attribute,
+							 char **default_value);
+void 		lsm_mathml_enum_attribute_parse 	(LsmMathmlEnumAttribute *attribute,
+							 unsigned int *default_value,
+							 LsmDomNamedConvert convert);
+void 		lsm_mathml_enum_list_attribute_parse 	(LsmMathmlEnumListAttribute *attribute,
+							 LsmMathmlEnumList *style_value,
+							 LsmDomNamedConvert convert);
+
+void		lsm_mathml_string_attribute_finalize	(void *abstract);
+void 		lsm_mathml_enum_list_attribute_finalize	(void *abstract);
+
+
+void 		lsm_mathml_attribute_map_add_string 	(LsmMathmlAttributeMap *map,
+							 char const *name,
+							 ptrdiff_t offset);
+void 		lsm_mathml_attribute_map_add_enum_list 	(LsmMathmlAttributeMap *map,
+							 char const *name,
+							 ptrdiff_t offset);
+
 void 		lsm_mathml_script_level_attribute_parse	(LsmMathmlScriptLevelAttribute *attribute,
 							 int *default_value);
-void 		lsm_mathml_mode_attribute_parse 	(LsmDomEnumAttribute *attribute,
+void 		lsm_mathml_mode_attribute_parse 	(LsmMathmlEnumAttribute *attribute,
 							 unsigned int *style_value);
-void 		lsm_mathml_display_attribute_parse 	(LsmDomEnumAttribute *attribute,
+void 		lsm_mathml_display_attribute_parse 	(LsmMathmlEnumAttribute *attribute,
 							 unsigned int *style_value);
-void 		lsm_mathml_form_attribute_parse	 	(LsmDomEnumAttribute *attribute,
+void 		lsm_mathml_form_attribute_parse	 	(LsmMathmlEnumAttribute *attribute,
 							 unsigned int *style_value);
-void 		lsm_mathml_font_style_attribute_parse 	(LsmDomEnumAttribute *attribute,
+void 		lsm_mathml_font_style_attribute_parse 	(LsmMathmlEnumAttribute *attribute,
 							 unsigned int *style_value);
-void 		lsm_mathml_font_weight_attribute_parse 	(LsmDomEnumAttribute *attribute,
+void 		lsm_mathml_font_weight_attribute_parse 	(LsmMathmlEnumAttribute *attribute,
 							 unsigned int *style_value);
-void 		lsm_mathml_variant_attribute_parse 	(LsmDomEnumAttribute *attribute,
+void 		lsm_mathml_variant_attribute_parse 	(LsmMathmlEnumAttribute *attribute,
 							 unsigned int *style_value);
-void		lsm_mathml_line_attribute_parse		(LsmDomEnumAttribute *attribute,
+void		lsm_mathml_line_attribute_parse		(LsmMathmlEnumAttribute *attribute,
 							 unsigned int *style_value);
 void		lsm_mathml_color_attribute_parse	(LsmMathmlColorAttribute *attribute,
 							 LsmMathmlColor *default_color);
@@ -274,14 +274,14 @@ void 		lsm_mathml_space_list_attribute_parse 	(LsmMathmlSpaceListAttribute *attr
 							 LsmMathmlSpaceList *style_value,
 							 const LsmMathmlStyle *style);
 
-void 	lsm_mathml_row_align_list_attribute_parse 	(LsmDomEnumListAttribute *attribute,
-							 LsmDomEnumList *style_value);
-void 	lsm_mathml_column_align_list_attribute_parse 	(LsmDomEnumListAttribute *attribute,
-							 LsmDomEnumList *style_value);
-void 	lsm_mathml_line_list_attribute_parse 		(LsmDomEnumListAttribute *attribute,
-							 LsmDomEnumList *style_value);
+void 	lsm_mathml_row_align_list_attribute_parse 	(LsmMathmlEnumListAttribute *attribute,
+							 LsmMathmlEnumList *style_value);
+void 	lsm_mathml_column_align_list_attribute_parse 	(LsmMathmlEnumListAttribute *attribute,
+							 LsmMathmlEnumList *style_value);
+void 	lsm_mathml_line_list_attribute_parse 		(LsmMathmlEnumListAttribute *attribute,
+							 LsmMathmlEnumList *style_value);
 
-void 	lsm_mathml_attribute_map_add_space_list 		(LsmMathmlAttributeMap *map,
+void 	lsm_mathml_attribute_map_add_space_list 	(LsmMathmlAttributeMap *map,
 							 char const *name,
 							 ptrdiff_t offset);
 G_END_DECLS
diff --git a/src/lsmmathmlfencedelement.c b/src/lsmmathmlfencedelement.c
index e47f747..a12eb8b 100644
--- a/src/lsmmathmlfencedelement.c
+++ b/src/lsmmathmlfencedelement.c
@@ -42,15 +42,15 @@ lsm_mathml_fenced_element_update (LsmMathmlElement *self, LsmMathmlStyle *style)
 	char *default_string;
 
 	default_string = g_strdup ("(");
-	lsm_dom_string_attribute_parse (&fenced->open, &default_string);
+	lsm_mathml_string_attribute_parse (&fenced->open, &default_string);
 	g_free (default_string);
 
 	default_string = g_strdup (")");
-	lsm_dom_string_attribute_parse (&fenced->close, &default_string);
+	lsm_mathml_string_attribute_parse (&fenced->close, &default_string);
 	g_free (default_string);
 
 	default_string = g_strdup (",");
-	lsm_dom_string_attribute_parse (&fenced->separators, &default_string);
+	lsm_mathml_string_attribute_parse (&fenced->separators, &default_string);
 	g_free (default_string);
 }
 
diff --git a/src/lsmmathmlfencedelement.h b/src/lsmmathmlfencedelement.h
index 7985103..e05a5b0 100644
--- a/src/lsmmathmlfencedelement.h
+++ b/src/lsmmathmlfencedelement.h
@@ -40,9 +40,9 @@ typedef struct _LsmMathmlFencedElementClass LsmMathmlFencedElementClass;
 struct _LsmMathmlFencedElement {
 	LsmMathmlPresentationContainer presentation_container;
 
-	LsmDomStringAttribute open;
-	LsmDomStringAttribute close;
-	LsmDomStringAttribute separators;
+	LsmMathmlStringAttribute open;
+	LsmMathmlStringAttribute close;
+	LsmMathmlStringAttribute separators;
 
 	/* View properties */
 
diff --git a/src/lsmmathmlfractionelement.c b/src/lsmmathmlfractionelement.c
index 90dc70e..a14fadd 100644
--- a/src/lsmmathmlfractionelement.c
+++ b/src/lsmmathmlfractionelement.c
@@ -49,7 +49,7 @@ lsm_mathml_fraction_element_update (LsmMathmlElement *self, LsmMathmlStyle *styl
 	LsmMathmlFractionElement *fraction = LSM_MATHML_FRACTION_ELEMENT (self);
 
 	lsm_mathml_length_attribute_parse (&fraction->line_thickness, &style->line_thickness, style->math_size_value);
-	lsm_dom_boolean_attribute_parse (&fraction->bevelled, &style->bevelled);
+	lsm_mathml_boolean_attribute_parse (&fraction->bevelled, &style->bevelled);
 
 	fraction->display = style->display;
 }
diff --git a/src/lsmmathmlfractionelement.h b/src/lsmmathmlfractionelement.h
index 45f0cc8..ac3f20c 100644
--- a/src/lsmmathmlfractionelement.h
+++ b/src/lsmmathmlfractionelement.h
@@ -41,7 +41,7 @@ struct _LsmMathmlFractionElement {
 	LsmMathmlElement presentation_container;
 
 	LsmMathmlLengthAttribute line_thickness;
-	LsmDomBooleanAttribute bevelled;
+	LsmMathmlBooleanAttribute bevelled;
 
 	LsmMathmlDisplay display;
 	double axis_offset;
diff --git a/src/lsmmathmlmathelement.h b/src/lsmmathmlmathelement.h
index 017fb77..ede39fb 100644
--- a/src/lsmmathmlmathelement.h
+++ b/src/lsmmathmlmathelement.h
@@ -49,8 +49,8 @@ struct _LsmMathmlMathElement {
 
 	LsmMathmlStyle *default_style;
 
-	LsmDomEnumAttribute mode;
-	LsmDomEnumAttribute display;
+	LsmMathmlEnumAttribute mode;
+	LsmMathmlEnumAttribute display;
 };
 
 struct _LsmMathmlMathElementClass {
diff --git a/src/lsmmathmloperatorelement.c b/src/lsmmathmloperatorelement.c
index 8dc197f..75e5f04 100644
--- a/src/lsmmathmloperatorelement.c
+++ b/src/lsmmathmloperatorelement.c
@@ -85,11 +85,11 @@ lsm_mathml_operator_element_post_new_child (LsmDomNode *self, LsmDomNode *child)
 		    lsm_mathml_form_to_string (entry->form), entry->name);
 
 	flag = entry->stretchy;
-	lsm_dom_boolean_attribute_parse (&operator_element->stretchy, &flag);
+	lsm_mathml_boolean_attribute_parse (&operator_element->stretchy, &flag);
 	flag = entry->fence;
-	lsm_dom_boolean_attribute_parse (&operator_element->fence, &flag);
+	lsm_mathml_boolean_attribute_parse (&operator_element->fence, &flag);
 	flag = entry->accent;
-	lsm_dom_boolean_attribute_parse (&operator_element->accent, &flag);
+	lsm_mathml_boolean_attribute_parse (&operator_element->accent, &flag);
 }
 
 /* LsmMathmlElement implementation */
@@ -114,27 +114,27 @@ lsm_mathml_operator_element_update (LsmMathmlElement *self, LsmMathmlStyle *styl
 	space = entry->right_space;
 	lsm_mathml_space_attribute_parse (&operator_element->right_space, &space, style);
 	flag = entry->stretchy;
-	lsm_dom_boolean_attribute_parse (&operator_element->stretchy, &flag);
+	lsm_mathml_boolean_attribute_parse (&operator_element->stretchy, &flag);
 	flag = entry->fence;
-	lsm_dom_boolean_attribute_parse (&operator_element->fence, &flag);
+	lsm_mathml_boolean_attribute_parse (&operator_element->fence, &flag);
 	flag = entry->accent;
-	lsm_dom_boolean_attribute_parse (&operator_element->accent, &flag);
+	lsm_mathml_boolean_attribute_parse (&operator_element->accent, &flag);
 
 	if (operator_element->accent.value)
 		lsm_debug ("[OperatorElement::update] Is accent");
 
 	flag = entry->large_op;
-	lsm_dom_boolean_attribute_parse (&operator_element->large_op, &flag);
+	lsm_mathml_boolean_attribute_parse (&operator_element->large_op, &flag);
 	flag = entry->movable_limits;
-	lsm_dom_boolean_attribute_parse (&operator_element->movable_limits, &flag);
+	lsm_mathml_boolean_attribute_parse (&operator_element->movable_limits, &flag);
 	flag = entry->separator;
-	lsm_dom_boolean_attribute_parse (&operator_element->separator, &flag);
+	lsm_mathml_boolean_attribute_parse (&operator_element->separator, &flag);
 	space = entry->min_size;
 	lsm_mathml_space_attribute_parse (&operator_element->min_size, &space, style);
 	space = entry->max_size;
 	lsm_mathml_space_attribute_parse (&operator_element->max_size, &space, style);
 	flag = entry->symmetric;
-	lsm_dom_boolean_attribute_parse (&operator_element->symmetric, &flag);
+	lsm_mathml_boolean_attribute_parse (&operator_element->symmetric, &flag);
 
 	operator_element->is_large_op = operator_element->large_op.value &&
 		(style->display == LSM_MATHML_DISPLAY_BLOCK);
diff --git a/src/lsmmathmloperatorelement.h b/src/lsmmathmloperatorelement.h
index 00e8663..3d3864c 100644
--- a/src/lsmmathmloperatorelement.h
+++ b/src/lsmmathmloperatorelement.h
@@ -40,18 +40,18 @@ typedef struct _LsmMathmlOperatorElementClass LsmMathmlOperatorElementClass;
 struct _LsmMathmlOperatorElement {
 	LsmMathmlPresentationToken presentation_token;
 
-	LsmDomEnumAttribute form;
-	LsmDomBooleanAttribute fence;
-	LsmDomBooleanAttribute separator;
+	LsmMathmlEnumAttribute form;
+	LsmMathmlBooleanAttribute fence;
+	LsmMathmlBooleanAttribute separator;
 	LsmMathmlSpaceAttribute left_space;
 	LsmMathmlSpaceAttribute right_space;
-	LsmDomBooleanAttribute stretchy;
-	LsmDomBooleanAttribute symmetric;
+	LsmMathmlBooleanAttribute stretchy;
+	LsmMathmlBooleanAttribute symmetric;
 	LsmMathmlSpaceAttribute max_size;
 	LsmMathmlSpaceAttribute min_size;
-	LsmDomBooleanAttribute large_op;
-	LsmDomBooleanAttribute movable_limits;
-	LsmDomBooleanAttribute accent;
+	LsmMathmlBooleanAttribute large_op;
+	LsmMathmlBooleanAttribute movable_limits;
+	LsmMathmlBooleanAttribute accent;
 
 	gboolean is_large_op;
 };
diff --git a/src/lsmmathmlpresentationtoken.c b/src/lsmmathmlpresentationtoken.c
index e607740..c74bdf1 100644
--- a/src/lsmmathmlpresentationtoken.c
+++ b/src/lsmmathmlpresentationtoken.c
@@ -112,7 +112,7 @@ lsm_mathml_presentation_token_update (LsmMathmlElement *self, LsmMathmlStyle *st
 	lsm_mathml_variant_set_font_style (&style->math_variant, font_style);
 	lsm_mathml_variant_set_font_weight (&style->math_variant, font_weight);
 
-	lsm_dom_string_attribute_parse (&token->math_family, &style->math_family);
+	lsm_mathml_string_attribute_parse (&token->math_family, &style->math_family);
 	lsm_mathml_variant_attribute_parse (&token->math_variant, &style->math_variant);
 	lsm_mathml_length_attribute_parse (&token->math_size, &style->math_size, style->math_size_value);
 	lsm_mathml_color_attribute_parse (&token->math_color, &style->math_color);
diff --git a/src/lsmmathmlpresentationtoken.h b/src/lsmmathmlpresentationtoken.h
index fcca46f..cbb1521 100644
--- a/src/lsmmathmlpresentationtoken.h
+++ b/src/lsmmathmlpresentationtoken.h
@@ -48,16 +48,16 @@ struct _LsmMathmlPresentationToken {
 
 	LsmMathmlPresentationTokenType type;
 
-	LsmDomStringAttribute	math_family;
-	LsmDomEnumAttribute	math_variant;
+	LsmMathmlStringAttribute	math_family;
+	LsmMathmlEnumAttribute	math_variant;
 	LsmMathmlLengthAttribute	math_size;
 	LsmMathmlColorAttribute	math_color;
 	LsmMathmlColorAttribute	math_background;
 
 	/* Deprecated style attributes */
 
-	LsmDomEnumAttribute font_weight;
-	LsmDomEnumAttribute font_style;
+	LsmMathmlEnumAttribute font_weight;
+	LsmMathmlEnumAttribute font_style;
 };
 
 struct _LsmMathmlPresentationTokenClass {
diff --git a/src/lsmmathmlstringelement.c b/src/lsmmathmlstringelement.c
index e0d2c51..ba54652 100644
--- a/src/lsmmathmlstringelement.c
+++ b/src/lsmmathmlstringelement.c
@@ -44,11 +44,11 @@ lsm_mathml_string_element_update (LsmMathmlElement *self, LsmMathmlStyle *style)
 	LSM_MATHML_ELEMENT_CLASS (parent_class)->update (self, style);
 
 	default_quote = g_strdup ("\"");
-	lsm_dom_string_attribute_parse (&string_element->left_quote, &default_quote);
+	lsm_mathml_string_attribute_parse (&string_element->left_quote, &default_quote);
 	g_free (default_quote);
 
 	default_quote = g_strdup ("\"");
-	lsm_dom_string_attribute_parse (&string_element->right_quote, &default_quote);
+	lsm_mathml_string_attribute_parse (&string_element->right_quote, &default_quote);
 	g_free (default_quote);
 }
 
diff --git a/src/lsmmathmlstringelement.h b/src/lsmmathmlstringelement.h
index 3cde814..c3b709e 100644
--- a/src/lsmmathmlstringelement.h
+++ b/src/lsmmathmlstringelement.h
@@ -39,8 +39,8 @@ typedef struct _LsmMathmlStringElementClass LsmMathmlStringElementClass;
 struct _LsmMathmlStringElement {
 	LsmMathmlPresentationToken presentation_token;
 
-	LsmDomStringAttribute left_quote;
-	LsmDomStringAttribute right_quote;
+	LsmMathmlStringAttribute left_quote;
+	LsmMathmlStringAttribute right_quote;
 };
 
 struct _LsmMathmlStringElementClass {
diff --git a/src/lsmmathmlstyleelement.c b/src/lsmmathmlstyleelement.c
index 8c63eab..b3828d0 100644
--- a/src/lsmmathmlstyleelement.c
+++ b/src/lsmmathmlstyleelement.c
@@ -46,10 +46,10 @@ lsm_mathml_style_element_update (LsmMathmlElement *self, LsmMathmlStyle *style)
 	LsmMathmlStyleElement *style_element = LSM_MATHML_STYLE_ELEMENT (self);
 
 	display_style = style->display == LSM_MATHML_DISPLAY_BLOCK;
-	lsm_dom_boolean_attribute_parse (&style_element->display_style, &display_style);
+	lsm_mathml_boolean_attribute_parse (&style_element->display_style, &display_style);
 	style->display = display_style ? LSM_MATHML_DISPLAY_BLOCK : LSM_MATHML_DISPLAY_INLINE;
 
-	lsm_dom_double_attribute_parse (&style_element->script_size_multiplier, &style->script_size_multiplier);
+	lsm_mathml_double_attribute_parse (&style_element->script_size_multiplier, &style->script_size_multiplier);
 	lsm_mathml_color_attribute_parse (&style_element->math_background, &style->math_background);
 	lsm_mathml_length_attribute_parse (&style_element->script_min_size,
 					&style->script_min_size,
@@ -68,7 +68,7 @@ lsm_mathml_style_element_update (LsmMathmlElement *self, LsmMathmlStyle *style)
 	lsm_mathml_variant_set_font_style (&style->math_variant, font_style);
 	lsm_mathml_variant_set_font_weight (&style->math_variant, font_weight);
 
-	lsm_dom_string_attribute_parse (&style_element->math_family, &style->math_family);
+	lsm_mathml_string_attribute_parse (&style_element->math_family, &style->math_family);
 	lsm_mathml_length_attribute_parse (&style_element->math_size, &style->math_size, style->math_size_value);
 	lsm_mathml_color_attribute_parse (&style_element->math_color, &style->math_color);
 	lsm_mathml_color_attribute_parse (&style_element->math_background, &style->math_background);
diff --git a/src/lsmmathmlstyleelement.h b/src/lsmmathmlstyleelement.h
index 5779acb..126e016 100644
--- a/src/lsmmathmlstyleelement.h
+++ b/src/lsmmathmlstyleelement.h
@@ -42,9 +42,9 @@ struct _LsmMathmlStyleElement {
 
 	/* Style attributes */
 
-	LsmDomBooleanAttribute display_style;
+	LsmMathmlBooleanAttribute display_style;
 	LsmMathmlScriptLevelAttribute script_level;
-	LsmDomDoubleAttribute script_size_multiplier;
+	LsmMathmlDoubleAttribute script_size_multiplier;
 	LsmMathmlLengthAttribute script_min_size;
 	LsmMathmlLengthAttribute very_very_thin_math_space;
 	LsmMathmlLengthAttribute very_thin_math_space;
@@ -56,13 +56,13 @@ struct _LsmMathmlStyleElement {
 
 	/* Deprecated style attributes */
 
-	LsmDomEnumAttribute font_weight;
-	LsmDomEnumAttribute font_style;
+	LsmMathmlEnumAttribute font_weight;
+	LsmMathmlEnumAttribute font_style;
 
 	/* Presentation token attribute */
 
-	LsmDomStringAttribute math_family;
-	LsmDomEnumAttribute  math_variant;
+	LsmMathmlStringAttribute math_family;
+	LsmMathmlEnumAttribute  math_variant;
 	LsmMathmlLengthAttribute math_size;
 	LsmMathmlColorAttribute  math_color;
 	LsmMathmlColorAttribute  math_background;
diff --git a/src/lsmmathmltablecellelement.c b/src/lsmmathmltablecellelement.c
index bd9fd24..88622a3 100644
--- a/src/lsmmathmltablecellelement.c
+++ b/src/lsmmathmltablecellelement.c
@@ -41,10 +41,10 @@ lsm_mathml_table_cell_element_update (LsmMathmlElement *self, LsmMathmlStyle *st
 	unsigned int span;
 
 	span = 1;
-	lsm_dom_unsigned_attribute_parse (&cell->row_span, &span);
+	lsm_mathml_unsigned_attribute_parse (&cell->row_span, &span);
 
 	span = 1;
-	lsm_dom_unsigned_attribute_parse (&cell->column_span, &span);
+	lsm_mathml_unsigned_attribute_parse (&cell->column_span, &span);
 }
 
 static const LsmMathmlBbox *
diff --git a/src/lsmmathmltablecellelement.h b/src/lsmmathmltablecellelement.h
index 0d8016e..f505ff6 100644
--- a/src/lsmmathmltablecellelement.h
+++ b/src/lsmmathmltablecellelement.h
@@ -40,8 +40,8 @@ typedef struct _LsmMathmlTableCellElementClass LsmMathmlTableCellElementClass;
 struct _LsmMathmlTableCellElement {
 	LsmMathmlElement	element;
 
-	LsmDomUnsignedAttribute row_span;
-	LsmDomUnsignedAttribute column_span;
+	LsmMathmlUnsignedAttribute row_span;
+	LsmMathmlUnsignedAttribute column_span;
 };
 
 struct _LsmMathmlTableCellElementClass {
diff --git a/src/lsmmathmltableelement.c b/src/lsmmathmltableelement.c
index 99668fd..4508bd3 100644
--- a/src/lsmmathmltableelement.c
+++ b/src/lsmmathmltableelement.c
@@ -50,7 +50,7 @@ lsm_mathml_table_element_update (LsmMathmlElement *self, LsmMathmlStyle *style)
 {
 	LsmMathmlTableElement *table = LSM_MATHML_TABLE_ELEMENT (self);
 	LsmMathmlSpaceList *space_list;
-	LsmDomEnumList enum_list;
+	LsmMathmlEnumList enum_list;
 	unsigned int enum_attribute;
 	gboolean flag;
 
@@ -102,13 +102,13 @@ lsm_mathml_table_element_update (LsmMathmlElement *self, LsmMathmlStyle *style)
 	lsm_mathml_space_list_free (space_list);
 
 	flag = FALSE;
-	lsm_dom_boolean_attribute_parse (&table->equal_rows, &flag);
+	lsm_mathml_boolean_attribute_parse (&table->equal_rows, &flag);
 
 	flag = FALSE;
-	lsm_dom_boolean_attribute_parse (&table->equal_columns, &flag);
+	lsm_mathml_boolean_attribute_parse (&table->equal_columns, &flag);
 
 	flag = FALSE;
-	lsm_dom_boolean_attribute_parse (&table->display_style, &flag);
+	lsm_mathml_boolean_attribute_parse (&table->display_style, &flag);
 }
 
 static const LsmMathmlBbox *
diff --git a/src/lsmmathmltableelement.h b/src/lsmmathmltableelement.h
index 09ed2ac..1fcc82e 100644
--- a/src/lsmmathmltableelement.h
+++ b/src/lsmmathmltableelement.h
@@ -40,17 +40,17 @@ typedef struct _LsmMathmlTableElementClass LsmMathmlTableElementClass;
 struct _LsmMathmlTableElement {
 	LsmMathmlElement	element;
 
-	LsmDomEnumListAttribute row_align;
-	LsmDomEnumListAttribute column_align;
+	LsmMathmlEnumListAttribute row_align;
+	LsmMathmlEnumListAttribute column_align;
 	LsmMathmlSpaceListAttribute row_spacing;
 	LsmMathmlSpaceListAttribute column_spacing;
-	LsmDomEnumListAttribute row_lines;
-	LsmDomEnumListAttribute column_lines;
-	LsmDomEnumAttribute frame;
+	LsmMathmlEnumListAttribute row_lines;
+	LsmMathmlEnumListAttribute column_lines;
+	LsmMathmlEnumAttribute frame;
 	LsmMathmlSpaceListAttribute frame_spacing;
-	LsmDomBooleanAttribute equal_rows;
-	LsmDomBooleanAttribute equal_columns;
-	LsmDomBooleanAttribute display_style;
+	LsmMathmlBooleanAttribute equal_rows;
+	LsmMathmlBooleanAttribute equal_columns;
+	LsmMathmlBooleanAttribute display_style;
 
 	/* View data */
 
diff --git a/src/lsmmathmlunderoverelement.c b/src/lsmmathmlunderoverelement.c
index a48dd23..9f0ef56 100644
--- a/src/lsmmathmlunderoverelement.c
+++ b/src/lsmmathmlunderoverelement.c
@@ -156,7 +156,7 @@ lsm_mathml_under_over_element_update_children (LsmMathmlElement *self, LsmMathml
 				    lsm_dom_node_get_node_name (LSM_DOM_NODE (operator)));
 		}
 
-		lsm_dom_boolean_attribute_parse (&under_over->accent_under, &accent_under);
+		lsm_mathml_boolean_attribute_parse (&under_over->accent_under, &accent_under);
 
 		if (!under_over->accent_under.value)
 			lsm_mathml_style_change_script_level (style, +1);
@@ -177,7 +177,7 @@ lsm_mathml_under_over_element_update_children (LsmMathmlElement *self, LsmMathml
 					    lsm_dom_node_get_node_name (LSM_DOM_NODE (operator)));
 		}
 
-		lsm_dom_boolean_attribute_parse (&under_over->accent, &accent);
+		lsm_mathml_boolean_attribute_parse (&under_over->accent, &accent);
 
 		if (!under_over->accent.value)
 			lsm_mathml_style_change_script_level (overscript_style, +1);
diff --git a/src/lsmmathmlunderoverelement.h b/src/lsmmathmlunderoverelement.h
index 153f1f5..66a7599 100644
--- a/src/lsmmathmlunderoverelement.h
+++ b/src/lsmmathmlunderoverelement.h
@@ -46,8 +46,8 @@ typedef struct _LsmMathmlUnderOverElementClass LsmMathmlUnderOverElementClass;
 struct _LsmMathmlUnderOverElement {
 	LsmMathmlElement	element;
 
-	LsmDomBooleanAttribute accent;
-	LsmDomBooleanAttribute accent_under;
+	LsmMathmlBooleanAttribute accent;
+	LsmMathmlBooleanAttribute accent_under;
 
 	LsmMathmlUnderOverElementType type;
[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]