[lasem/mml-attrs] [Mathml] Migration to lsm_attribute_manager WIP.
- From: Emmanuel Pacaud <emmanuel src gnome org>
- To: svn-commits-list gnome org
- Cc:
- Subject: [lasem/mml-attrs] [Mathml] Migration to lsm_attribute_manager WIP.
- Date: Sun, 13 Dec 2009 21:04:57 +0000 (UTC)
commit de0c1998d03853d1d40e70c6b144b105ef5aa5dc
Author: Emmanuel Pacaud <emmanuel gnome org>
Date: Sun Dec 13 22:04:23 2009 +0100
[Mathml] Migration to lsm_attribute_manager WIP.
Remove commented code.
src/lsmmathmlattributes.c | 106 --------------------------------------
src/lsmmathmlattributes.h | 33 ------------
src/lsmmathmlfencedelement.c | 31 -----------
src/lsmmathmlfractionelement.c | 3 -
src/lsmmathmloperatorelement.c | 38 --------------
src/lsmmathmlpresentationtoken.c | 5 --
src/lsmmathmlstringelement.c | 21 --------
src/lsmmathmlstyleelement.c | 11 ----
src/lsmmathmltablecellelement.c | 23 --------
src/lsmmathmltableelement.c | 14 -----
src/lsmmathmlunderoverelement.c | 11 ----
11 files changed, 0 insertions(+), 296 deletions(-)
---
diff --git a/src/lsmmathmlattributes.c b/src/lsmmathmlattributes.c
index dcf832f..4a6948f 100644
--- a/src/lsmmathmlattributes.c
+++ b/src/lsmmathmlattributes.c
@@ -377,89 +377,6 @@ lsm_mathml_attribute_get_value (const LsmMathmlAttribute *attribute)
return attribute->value;
}
-#if 0
-void
-lsm_mathml_boolean_attribute_parse (LsmMathmlBooleanAttribute *attribute,
- gboolean *style_value)
-{
- const char *string;
-
- g_return_if_fail (attribute != NULL);
- g_return_if_fail (style_value != NULL);
-
- string = lsm_mathml_attribute_get_value ((LsmMathmlAttribute *) attribute);
- if (string == NULL) {
- attribute->value = *style_value;
- return;
- }
-
- attribute->value = (strcmp (string, "true") == 0);
- *style_value = attribute->value;
-}
-
-void
-lsm_mathml_unsigned_attribute_parse (LsmMathmlUnsignedAttribute *attribute,
- unsigned int *style_value)
-{
- const char *string;
-
- g_return_if_fail (attribute != NULL);
- g_return_if_fail (style_value != NULL);
-
- string = lsm_mathml_attribute_get_value ((LsmMathmlAttribute *) attribute);
- if (string == NULL) {
- attribute->value = *style_value;
- return;
- }
-
- attribute->value = atoi (string);
- *style_value = attribute->value;
-}
-
-void
-lsm_mathml_double_attribute_parse (LsmMathmlDoubleAttribute *attribute,
- double *style_value)
-{
- const char *string;
-
- g_return_if_fail (attribute != NULL);
- g_return_if_fail (style_value != NULL);
-
- string = lsm_mathml_attribute_get_value ((LsmMathmlAttribute *) attribute);
- if (string == NULL) {
- attribute->value = *style_value;
- return;
- }
-
- attribute->value = atof (string);
- *style_value = attribute->value;
-}
-
-
-void
-lsm_mathml_string_attribute_parse (LsmMathmlStringAttribute *attribute,
- char **style_value)
-{
- const char *string;
-
- g_return_if_fail (attribute != NULL);
- g_return_if_fail (style_value != NULL);
- g_return_if_fail (*style_value != NULL);
-
- string = lsm_mathml_attribute_get_value ((LsmMathmlAttribute *) attribute);
- if (string == NULL) {
- g_free (attribute->value);
- attribute->value = g_strdup (*style_value);
- } else {
- g_free (*style_value);
- *style_value = g_strdup (string);
- g_free (attribute->value);
- attribute->value = g_strdup (string);
- }
-}
-
-#endif
-
void
lsm_mathml_enum_attribute_parse (LsmMathmlEnumAttribute *attribute,
unsigned int *style_value,
@@ -518,19 +435,6 @@ lsm_mathml_enum_list_attribute_parse (LsmMathmlEnumListAttribute *attribute,
g_strfreev (items);
}
-#if 0
-void
-lsm_mathml_string_attribute_finalize (void *abstract)
-{
- LsmMathmlStringAttribute *attribute = abstract;
-
- g_return_if_fail (attribute != NULL);
-
- g_free (attribute->value);
- attribute->value = NULL;
-}
-#endif
-
void
lsm_mathml_enum_list_attribute_finalize (void *abstract)
{
@@ -547,16 +451,6 @@ static const LsmMathmlAttributeClass string_attribute_class = {
.finalize = lsm_mathml_string_attribute_finalize
};
-#if 0
-void
-lsm_mathml_attribute_map_add_string (LsmMathmlAttributeMap *map,
- char const *name,
- ptrdiff_t offset)
-{
- lsm_mathml_attribute_map_add_attribute_full (map, name, offset, &string_attribute_class);
-}
-#endif
-
static const LsmMathmlAttributeClass enum_list_attribute_class = {
.finalize = lsm_mathml_enum_list_attribute_finalize
};
diff --git a/src/lsmmathmlattributes.h b/src/lsmmathmlattributes.h
index e605900..02f5352 100644
--- a/src/lsmmathmlattributes.h
+++ b/src/lsmmathmlattributes.h
@@ -132,24 +132,6 @@ typedef unsigned int (*LsmDomNamedConvert) (const char *string);
#define LSM_MATHML_SPACE_EM_VERY_THICK 0.333333
#define LSM_MATHML_SPACE_EM_VERY_VERY_THICK 0.388889
-#if 0
-typedef struct {
- LsmMathmlAttribute attr;
- gboolean value;
-} LsmMathmlBooleanAttribute;
-
-typedef struct {
- LsmMathmlAttribute attr;
- unsigned int value;
-} LsmMathmlUnsignedAttribute;
-
-typedef struct {
- LsmMathmlAttribute attr;
- double value;
-} LsmMathmlDoubleAttribute;
-
-#endif
-
typedef struct {
LsmMathmlAttribute attr;
unsigned int value;
@@ -234,16 +216,6 @@ typedef struct {
double *values;
} LsmMathmlSpaceListAttribute;
-#if 0
-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);
-#endif
void lsm_mathml_enum_attribute_parse (LsmMathmlEnumAttribute *attribute,
unsigned int *default_value,
LsmDomNamedConvert convert);
@@ -255,11 +227,6 @@ void lsm_mathml_string_attribute_finalize (void *abstract);
void lsm_mathml_enum_list_attribute_finalize (void *abstract);
-#if 0
-void lsm_mathml_attribute_map_add_string (LsmMathmlAttributeMap *map,
- char const *name,
- ptrdiff_t offset);
-#endif
void lsm_mathml_attribute_map_add_enum_list (LsmMathmlAttributeMap *map,
char const *name,
ptrdiff_t offset);
diff --git a/src/lsmmathmlfencedelement.c b/src/lsmmathmlfencedelement.c
index 4f3dd19..4a1a47d 100644
--- a/src/lsmmathmlfencedelement.c
+++ b/src/lsmmathmlfencedelement.c
@@ -35,27 +35,6 @@ lsm_mathml_fenced_element_get_node_name (LsmDomNode *node)
/* LsmMathmlElement implementation */
-#if 0
-static void
-lsm_mathml_fenced_element_update (LsmMathmlElement *self, LsmMathmlStyle *style)
-{
- LsmMathmlFencedElement *fenced = LSM_MATHML_FENCED_ELEMENT (self);
- char *default_string;
-
- default_string = g_strdup ("(");
- lsm_mathml_string_attribute_parse (&fenced->open, &default_string);
- g_free (default_string);
-
- default_string = g_strdup (")");
- lsm_mathml_string_attribute_parse (&fenced->close, &default_string);
- g_free (default_string);
-
- default_string = g_strdup (",");
- lsm_mathml_string_attribute_parse (&fenced->separators, &default_string);
- g_free (default_string);
-}
-#endif
-
static const LsmMathmlBbox *
lsm_mathml_fenced_element_measure (LsmMathmlElement *self, LsmMathmlView *view, const LsmMathmlBbox *bbox)
{
@@ -184,7 +163,6 @@ lsm_mathml_fenced_element_class_init (LsmMathmlFencedElementClass *m_fenced_elem
d_node_class->get_node_name = lsm_mathml_fenced_element_get_node_name;
-/* m_element_class->update = lsm_mathml_fenced_element_update;*/
m_element_class->measure = lsm_mathml_fenced_element_measure;
m_element_class->layout = lsm_mathml_fenced_element_layout;
m_element_class->render = lsm_mathml_fenced_element_render;
@@ -193,15 +171,6 @@ lsm_mathml_fenced_element_class_init (LsmMathmlFencedElementClass *m_fenced_elem
lsm_attribute_manager_add_attributes (m_element_class->attribute_manager,
G_N_ELEMENTS (_attribute_infos),
_attribute_infos);
-
-/* m_element_class->attributes = lsm_mathml_attribute_map_duplicate (m_element_class->attributes);*/
-
-/* lsm_mathml_attribute_map_add_string (m_element_class->attributes, "open",*/
-/* offsetof (LsmMathmlFencedElement, open));*/
-/* lsm_mathml_attribute_map_add_string (m_element_class->attributes, "close",*/
-/* offsetof (LsmMathmlFencedElement, close));*/
-/* lsm_mathml_attribute_map_add_string (m_element_class->attributes, "separators",*/
-/* offsetof (LsmMathmlFencedElement, separators));*/
}
G_DEFINE_TYPE (LsmMathmlFencedElement, lsm_mathml_fenced_element, LSM_TYPE_MATHML_PRESENTATION_CONTAINER)
diff --git a/src/lsmmathmlfractionelement.c b/src/lsmmathmlfractionelement.c
index a4c1dfd..5fdc9e3 100644
--- a/src/lsmmathmlfractionelement.c
+++ b/src/lsmmathmlfractionelement.c
@@ -49,7 +49,6 @@ 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_mathml_boolean_attribute_parse (&fraction->bevelled, &style->bevelled);*/
fraction->display = style->display;
}
@@ -238,8 +237,6 @@ lsm_mathml_fraction_element_class_init (LsmMathmlFractionElementClass *fraction_
lsm_mathml_attribute_map_add_attribute (m_element_class->attributes, "linethickness",
offsetof (LsmMathmlFractionElement, line_thickness));
-/* lsm_mathml_attribute_map_add_attribute (m_element_class->attributes, "bevelled",*/
-/* offsetof (LsmMathmlFractionElement, bevelled));*/
}
G_DEFINE_TYPE (LsmMathmlFractionElement, lsm_mathml_fraction_element, LSM_TYPE_MATHML_ELEMENT)
diff --git a/src/lsmmathmloperatorelement.c b/src/lsmmathmloperatorelement.c
index a962b4c..5a39dca 100644
--- a/src/lsmmathmloperatorelement.c
+++ b/src/lsmmathmloperatorelement.c
@@ -77,20 +77,12 @@ lsm_mathml_operator_element_post_new_child (LsmDomNode *self, LsmDomNode *child)
{
LsmMathmlOperatorElement *operator_element = LSM_MATHML_OPERATOR_ELEMENT (self);
const LsmMathmlOperatorDictionaryEntry *entry;
-/* gboolean flag;*/
entry = lsm_mathml_operator_element_dictionary_lookup (operator_element);
lsm_debug ("[OperatorElement::post_new_child] found %s %s",
lsm_mathml_form_to_string (entry->form), entry->name);
-/* flag = entry->stretchy;*/
-/* lsm_mathml_boolean_attribute_parse (&operator_element->stretchy, &flag);*/
-/* flag = entry->fence;*/
-/* lsm_mathml_boolean_attribute_parse (&operator_element->fence, &flag);*/
-/* flag = entry->accent;*/
-/* lsm_mathml_boolean_attribute_parse (&operator_element->accent, &flag);*/
-
lsm_mathml_boolean_attribute_inherit (&operator_element->stretchy, entry->stretchy);
lsm_mathml_boolean_attribute_inherit (&operator_element->fence, entry->fence);
lsm_mathml_boolean_attribute_inherit (&operator_element->accent, entry->accent);
@@ -104,7 +96,6 @@ lsm_mathml_operator_element_update (LsmMathmlElement *self, LsmMathmlStyle *styl
LsmMathmlOperatorElement *operator_element = LSM_MATHML_OPERATOR_ELEMENT (self);
const LsmMathmlOperatorDictionaryEntry *entry;
LsmMathmlSpace space;
-/* gboolean flag;*/
LSM_MATHML_ELEMENT_CLASS (parent_class)->update (self, style);
@@ -117,13 +108,6 @@ lsm_mathml_operator_element_update (LsmMathmlElement *self, LsmMathmlStyle *styl
lsm_mathml_space_attribute_parse (&operator_element->left_space, &space, style);
space = entry->right_space;
lsm_mathml_space_attribute_parse (&operator_element->right_space, &space, style);
-/* flag = entry->stretchy;*/
-/* lsm_mathml_boolean_attribute_parse (&operator_element->stretchy, &flag);*/
-/* flag = entry->fence;*/
-/* lsm_mathml_boolean_attribute_parse (&operator_element->fence, &flag);*/
-/* flag = entry->accent;*/
-/* lsm_mathml_boolean_attribute_parse (&operator_element->accent, &flag);*/
-/* flag = entry->stretchy;*/
lsm_mathml_boolean_attribute_inherit (&operator_element->stretchy, entry->stretchy);
lsm_mathml_boolean_attribute_inherit (&operator_element->fence, entry->fence);
lsm_mathml_boolean_attribute_inherit (&operator_element->accent, entry->accent);
@@ -131,12 +115,6 @@ lsm_mathml_operator_element_update (LsmMathmlElement *self, LsmMathmlStyle *styl
if (operator_element->accent.value)
lsm_debug ("[OperatorElement::update] Is accent");
-/* flag = entry->large_op;*/
-/* lsm_mathml_boolean_attribute_parse (&operator_element->large_op, &flag);*/
-/* flag = entry->movable_limits;*/
-/* lsm_mathml_boolean_attribute_parse (&operator_element->movable_limits, &flag);*/
-/* flag = entry->separator;*/
-/* lsm_mathml_boolean_attribute_parse (&operator_element->separator, &flag);*/
lsm_mathml_boolean_attribute_inherit (&operator_element->large_op, entry->large_op);
lsm_mathml_boolean_attribute_inherit (&operator_element->movable_limits, entry->movable_limits);
lsm_mathml_boolean_attribute_inherit (&operator_element->separator, entry->separator);
@@ -144,8 +122,6 @@ lsm_mathml_operator_element_update (LsmMathmlElement *self, LsmMathmlStyle *styl
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_mathml_boolean_attribute_parse (&operator_element->symmetric, &flag);*/
lsm_mathml_boolean_attribute_inherit (&operator_element->symmetric, entry->symmetric);
operator_element->is_large_op = operator_element->large_op.value &&
@@ -295,28 +271,14 @@ lsm_mathml_operator_element_class_init (LsmMathmlOperatorElementClass *operator_
lsm_mathml_attribute_map_add_attribute (m_element_class->attributes, "form",
offsetof (LsmMathmlOperatorElement, form));
-/* lsm_mathml_attribute_map_add_attribute (m_element_class->attributes, "fence",*/
-/* offsetof (LsmMathmlOperatorElement, fence));*/
-/* lsm_mathml_attribute_map_add_attribute (m_element_class->attributes, "separator",*/
-/* offsetof (LsmMathmlOperatorElement, separator));*/
lsm_mathml_attribute_map_add_attribute (m_element_class->attributes, "lspace",
offsetof (LsmMathmlOperatorElement, left_space));
lsm_mathml_attribute_map_add_attribute (m_element_class->attributes, "rspace",
offsetof (LsmMathmlOperatorElement, right_space));
-/* lsm_mathml_attribute_map_add_attribute (m_element_class->attributes, "stretchy",*/
-/* offsetof (LsmMathmlOperatorElement, stretchy));*/
-/* lsm_mathml_attribute_map_add_attribute (m_element_class->attributes, "symmetric",*/
-/* offsetof (LsmMathmlOperatorElement, symmetric));*/
-/* lsm_mathml_attribute_map_add_attribute (m_element_class->attributes, "accent",*/
-/* offsetof (LsmMathmlOperatorElement, accent));*/
lsm_mathml_attribute_map_add_attribute (m_element_class->attributes, "minsize",
offsetof (LsmMathmlOperatorElement, min_size));
lsm_mathml_attribute_map_add_attribute (m_element_class->attributes, "maxsize",
offsetof (LsmMathmlOperatorElement, max_size));
-/* lsm_mathml_attribute_map_add_attribute (m_element_class->attributes, "largeop",*/
-/* offsetof (LsmMathmlOperatorElement, large_op));*/
-/* lsm_mathml_attribute_map_add_attribute (m_element_class->attributes, "movablelimits",*/
-/* offsetof (LsmMathmlOperatorElement, movable_limits));*/
}
G_DEFINE_TYPE (LsmMathmlOperatorElement, lsm_mathml_operator_element, LSM_TYPE_MATHML_PRESENTATION_TOKEN)
diff --git a/src/lsmmathmlpresentationtoken.c b/src/lsmmathmlpresentationtoken.c
index f3dc6c2..93f44f5 100644
--- a/src/lsmmathmlpresentationtoken.c
+++ b/src/lsmmathmlpresentationtoken.c
@@ -115,7 +115,6 @@ lsm_mathml_presentation_token_update (LsmMathmlElement *self, LsmMathmlStyle *st
lsm_mathml_style_set_math_family (style,
lsm_mathml_string_attribute_inherit (&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);
@@ -247,8 +246,6 @@ lsm_mathml_presentation_token_class_init (LsmMathmlPresentationTokenClass *m_tok
m_element_class->attributes = lsm_mathml_attribute_map_duplicate (m_element_class->attributes);
-/* lsm_mathml_attribute_map_add_string (m_element_class->attributes, "mathfamily",*/
-/* offsetof (LsmMathmlPresentationToken, math_family));*/
lsm_mathml_attribute_map_add_attribute (m_element_class->attributes, "mathvariant",
offsetof (LsmMathmlPresentationToken, math_variant));
lsm_mathml_attribute_map_add_attribute (m_element_class->attributes, "mathsize",
@@ -260,8 +257,6 @@ lsm_mathml_presentation_token_class_init (LsmMathmlPresentationTokenClass *m_tok
/* Deprecated attributes */
-/* lsm_mathml_attribute_map_add_string (m_element_class->attributes, "fontfamily",*/
-/* offsetof (LsmMathmlPresentationToken, math_family));*/
lsm_mathml_attribute_map_add_attribute (m_element_class->attributes, "fontsize",
offsetof (LsmMathmlPresentationToken, math_size));
lsm_mathml_attribute_map_add_attribute (m_element_class->attributes, "color",
diff --git a/src/lsmmathmlstringelement.c b/src/lsmmathmlstringelement.c
index dd429ba..5730a36 100644
--- a/src/lsmmathmlstringelement.c
+++ b/src/lsmmathmlstringelement.c
@@ -38,21 +38,7 @@ lsm_mathml_string_element_get_node_name (LsmDomNode *node)
static void
lsm_mathml_string_element_update (LsmMathmlElement *self, LsmMathmlStyle *style)
{
-/* LsmMathmlStringElement *string_element = LSM_MATHML_STRING_ELEMENT (self);*/
-/* char *default_quote;*/
-
LSM_MATHML_ELEMENT_CLASS (parent_class)->update (self, style);
-
-/* default_quote = g_strdup ("\"");*/
-/* lsm_mathml_string_attribute_parse (&string_element->left_quote, &default_quote);*/
-/* g_free (default_quote);*/
-
-/* default_quote = g_strdup ("\"");*/
-/* lsm_mathml_string_attribute_parse (&string_element->right_quote, &default_quote);*/
-/* g_free (default_quote);*/
-
-/* lsm_mathml_string_attribute_inherit (&string_element->left_quote, "\"");*/
-/* lsm_mathml_string_attribute_inherit (&string_element->right_quote, "\"");*/
}
/* LsmMathmlPresentationToken implementation */
@@ -129,13 +115,6 @@ lsm_mathml_string_element_class_init (LsmMathmlStringElementClass *string_class)
_attribute_infos);
m_token_class->get_text = lsm_mathml_string_element_get_text;
-
-/* m_element_class->attributes = lsm_mathml_attribute_map_duplicate (m_element_class->attributes);*/
-
-/* lsm_mathml_attribute_map_add_string (m_element_class->attributes, "lquote",*/
-/* offsetof (LsmMathmlStringElement, left_quote));*/
-/* lsm_mathml_attribute_map_add_string (m_element_class->attributes, "rquote",*/
-/* offsetof (LsmMathmlStringElement, right_quote));*/
}
G_DEFINE_TYPE (LsmMathmlStringElement, lsm_mathml_string_element, LSM_TYPE_MATHML_PRESENTATION_TOKEN)
diff --git a/src/lsmmathmlstyleelement.c b/src/lsmmathmlstyleelement.c
index 9d0dd38..594ccee 100644
--- a/src/lsmmathmlstyleelement.c
+++ b/src/lsmmathmlstyleelement.c
@@ -46,11 +46,9 @@ 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_mathml_boolean_attribute_parse (&style_element->display_style, &display_style);*/
lsm_mathml_boolean_attribute_inherit (&style_element->display_style, display_style);
style->display = style_element->display_style.value ? LSM_MATHML_DISPLAY_BLOCK : LSM_MATHML_DISPLAY_INLINE;
-/* lsm_mathml_double_attribute_parse (&style_element->script_size_multiplier, &style->script_size_multiplier);*/
style->script_size_multiplier = lsm_mathml_double_attribute_inherit (&style_element->script_size_multiplier,
style->script_size_multiplier);
lsm_mathml_color_attribute_parse (&style_element->math_background, &style->math_background);
@@ -75,7 +73,6 @@ lsm_mathml_style_element_update (LsmMathmlElement *self, LsmMathmlStyle *style)
lsm_mathml_style_set_math_family (style,
lsm_mathml_string_attribute_inherit (&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);
@@ -175,10 +172,6 @@ lsm_mathml_style_element_class_init (LsmMathmlStyleElementClass *style_class)
lsm_mathml_attribute_map_add_attribute (m_element_class->attributes, "scriptlevel",
offsetof (LsmMathmlStyleElement, script_level));
-/* lsm_mathml_attribute_map_add_attribute (m_element_class->attributes, "displaystyle",*/
-/* offsetof (LsmMathmlStyleElement, display_style));*/
-/* lsm_mathml_attribute_map_add_attribute (m_element_class->attributes, "scriptsizemultiplier",*/
-/* offsetof (LsmMathmlStyleElement, script_size_multiplier));*/
lsm_mathml_attribute_map_add_attribute (m_element_class->attributes, "scriptminsize",
offsetof (LsmMathmlStyleElement, script_min_size));
lsm_mathml_attribute_map_add_attribute (m_element_class->attributes, "background",
@@ -198,8 +191,6 @@ lsm_mathml_style_element_class_init (LsmMathmlStyleElementClass *style_class)
lsm_mathml_attribute_map_add_attribute (m_element_class->attributes, "veryverythickmathspace",
offsetof (LsmMathmlStyleElement, very_very_thick_math_space));
-/* lsm_mathml_attribute_map_add_string (m_element_class->attributes, "mathfamily",*/
-/* offsetof (LsmMathmlStyleElement, math_family));*/
lsm_mathml_attribute_map_add_attribute (m_element_class->attributes, "mathvariant",
offsetof (LsmMathmlStyleElement, math_variant));
lsm_mathml_attribute_map_add_attribute (m_element_class->attributes, "mathsize",
@@ -214,8 +205,6 @@ lsm_mathml_style_element_class_init (LsmMathmlStyleElementClass *style_class)
/* Deprecated attributes */
-/* lsm_mathml_attribute_map_add_string (m_element_class->attributes, "fontfamily",*/
-/* offsetof (LsmMathmlStyleElement, math_family));*/
lsm_mathml_attribute_map_add_attribute (m_element_class->attributes, "fontsize",
offsetof (LsmMathmlStyleElement, math_size));
lsm_mathml_attribute_map_add_attribute (m_element_class->attributes, "color",
diff --git a/src/lsmmathmltablecellelement.c b/src/lsmmathmltablecellelement.c
index 1292e2d..9772da6 100644
--- a/src/lsmmathmltablecellelement.c
+++ b/src/lsmmathmltablecellelement.c
@@ -34,21 +34,6 @@ lsm_mathml_table_cell_get_node_name (LsmDomNode *node)
/* LsmMathmlElement implementation */
-#if 0
-static void
-lsm_mathml_table_cell_element_update (LsmMathmlElement *self, LsmMathmlStyle *style)
-{
- LsmMathmlTableCellElement *cell = LSM_MATHML_TABLE_CELL_ELEMENT (self);
- unsigned int span;
-
- span = 1;
- lsm_mathml_unsigned_attribute_parse (&cell->row_span, &span);
-
- span = 1;
- lsm_mathml_unsigned_attribute_parse (&cell->column_span, &span);
-}
-#endif
-
static const LsmMathmlBbox *
lsm_mathml_table_cell_element_measure (LsmMathmlElement *self, LsmMathmlView *view, const LsmMathmlBbox *bbox)
{
@@ -124,7 +109,6 @@ lsm_mathml_table_cell_element_class_init (LsmMathmlTableCellElementClass *table_
d_node_class->get_node_name = lsm_mathml_table_cell_get_node_name;
-/* m_element_class->update = lsm_mathml_table_cell_element_update;*/
m_element_class->measure = lsm_mathml_table_cell_element_measure;
m_element_class->layout = lsm_mathml_table_cell_element_layout;
m_element_class->attribute_manager = lsm_attribute_manager_duplicate (m_element_class->attribute_manager);
@@ -132,13 +116,6 @@ lsm_mathml_table_cell_element_class_init (LsmMathmlTableCellElementClass *table_
lsm_attribute_manager_add_attributes (m_element_class->attribute_manager,
G_N_ELEMENTS (_attribute_infos),
_attribute_infos);
-
-/* m_element_class->attributes = lsm_mathml_attribute_map_duplicate (m_element_class->attributes);*/
-
-/* lsm_mathml_attribute_map_add_attribute (m_element_class->attributes, "rowspan",*/
-/* offsetof (LsmMathmlTableCellElement, row_span));*/
-/* lsm_mathml_attribute_map_add_attribute (m_element_class->attributes, "columnspan",*/
-/* offsetof (LsmMathmlTableCellElement, column_span));*/
}
G_DEFINE_TYPE (LsmMathmlTableCellElement, lsm_mathml_table_cell_element, LSM_TYPE_MATHML_ELEMENT)
diff --git a/src/lsmmathmltableelement.c b/src/lsmmathmltableelement.c
index dc76a98..3689111 100644
--- a/src/lsmmathmltableelement.c
+++ b/src/lsmmathmltableelement.c
@@ -52,7 +52,6 @@ lsm_mathml_table_element_update (LsmMathmlElement *self, LsmMathmlStyle *style)
LsmMathmlSpaceList *space_list;
LsmMathmlEnumList enum_list;
unsigned int enum_attribute;
-/* gboolean flag;*/
enum_list.n_values = 1;
enum_list.values = &enum_attribute;
@@ -100,15 +99,6 @@ lsm_mathml_table_element_update (LsmMathmlElement *self, LsmMathmlStyle *style)
lsm_mathml_space_list_attribute_parse (&table->frame_spacing, space_list, style);
lsm_mathml_space_list_free (space_list);
-
-/* flag = FALSE;*/
-/* lsm_mathml_boolean_attribute_parse (&table->equal_rows, &flag);*/
-
-/* flag = FALSE;*/
-/* lsm_mathml_boolean_attribute_parse (&table->equal_columns, &flag);*/
-
-/* flag = FALSE;*/
-/* lsm_mathml_boolean_attribute_parse (&table->display_style, &flag);*/
}
static const LsmMathmlBbox *
@@ -526,10 +516,6 @@ lsm_mathml_table_element_class_init (LsmMathmlTableElementClass *table_class)
offsetof (LsmMathmlTableElement, frame));
lsm_mathml_attribute_map_add_space_list (m_element_class->attributes, "framespacing",
offsetof (LsmMathmlTableElement, frame_spacing));
-/* lsm_mathml_attribute_map_add_attribute (m_element_class->attributes, "equalrows",*/
-/* offsetof (LsmMathmlTableElement, equal_rows));*/
-/* lsm_mathml_attribute_map_add_attribute (m_element_class->attributes, "equalcolumns",*/
-/* offsetof (LsmMathmlTableElement, equal_columns));*/
}
G_DEFINE_TYPE (LsmMathmlTableElement, lsm_mathml_table_element, LSM_TYPE_MATHML_ELEMENT)
diff --git a/src/lsmmathmlunderoverelement.c b/src/lsmmathmlunderoverelement.c
index 6f7fff6..e2f4ab6 100644
--- a/src/lsmmathmlunderoverelement.c
+++ b/src/lsmmathmlunderoverelement.c
@@ -156,7 +156,6 @@ lsm_mathml_under_over_element_update_children (LsmMathmlElement *self, LsmMathml
lsm_dom_node_get_node_name (LSM_DOM_NODE (operator)));
}
-/* lsm_mathml_boolean_attribute_parse (&under_over->accent_under, &accent_under);*/
accent_under = lsm_mathml_boolean_attribute_inherit (&under_over->accent_under, accent_under);
if (!under_over->accent_under.value)
@@ -178,7 +177,6 @@ lsm_mathml_under_over_element_update_children (LsmMathmlElement *self, LsmMathml
lsm_dom_node_get_node_name (LSM_DOM_NODE (operator)));
}
-/* lsm_mathml_boolean_attribute_parse (&under_over->accent, &accent);*/
accent = lsm_mathml_boolean_attribute_inherit (&under_over->accent, accent);
if (!under_over->accent.value)
@@ -202,8 +200,6 @@ lsm_mathml_under_over_element_update_children (LsmMathmlElement *self, LsmMathml
under_over->under_space = accent_under ? accent_v_space : v_space;
under_over->over_space = accent ? accent_v_space : v_space;
-/* under_over->under_space = under_over->accent_under.value ? accent_v_space : v_space;*/
-/* under_over->over_space = under_over->accent.value ? accent_v_space : v_space;*/
under_over->as_script = under_over->display == LSM_MATHML_DISPLAY_INLINE && movable_limits;
@@ -484,13 +480,6 @@ lsm_mathml_under_over_element_class_init (LsmMathmlUnderOverElementClass *under_
lsm_attribute_manager_add_attributes (m_element_class->attribute_manager,
G_N_ELEMENTS (_attribute_infos),
_attribute_infos);
-
-/* m_element_class->attributes = lsm_mathml_attribute_map_duplicate (m_element_class->attributes);*/
-
-/* lsm_mathml_attribute_map_add_attribute (m_element_class->attributes, "accent",*/
-/* offsetof (LsmMathmlUnderOverElement, accent));*/
-/* lsm_mathml_attribute_map_add_attribute (m_element_class->attributes, "accentunder",*/
-/* offsetof (LsmMathmlUnderOverElement, accent_under));*/
}
G_DEFINE_TYPE (LsmMathmlUnderOverElement, lsm_mathml_under_over_element, LSM_TYPE_MATHML_ELEMENT)
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]