summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--ChangeLog14
-rw-r--r--ChangeLog.pre-1-014
-rw-r--r--ChangeLog.pre-1-1014
-rw-r--r--ChangeLog.pre-1-214
-rw-r--r--ChangeLog.pre-1-414
-rw-r--r--ChangeLog.pre-1-614
-rw-r--r--ChangeLog.pre-1-814
-rw-r--r--docs/pango-sections.txt4
-rw-r--r--docs/tmpl/fonts.sgml2
-rw-r--r--docs/tmpl/text-attributes.sgml4
-rw-r--r--pango/fonts.c6
-rw-r--r--pango/pango-attributes.c68
-rw-r--r--pango/pango-attributes.h4
-rw-r--r--pango/pango-context.c2
-rw-r--r--pango/pango-font.h2
15 files changed, 144 insertions, 46 deletions
diff --git a/ChangeLog b/ChangeLog
index 2ebb604e..ad4b077b 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,17 @@
+2000-11-13 Sebastian Wilhelmi <wilhelmi@ira.uka.de>
+
+ * pango/pango-attributes.c, pango/pango-attributes.h: Renamed
+ pango_attribute_compare to pango_attribute_equal. Renamed compare
+ member of PangoAttrClass to equal. Renamed some static functions
+ from ..._compare to ..._equal.
+
+ * pango/fonts.c, pango/pango-font.h, pango/pango-context.c:
+ Renamed pango_font_description_compare to
+ pango_font_description_equal.
+
+ * docs/pango-sections.txt, docs/tmpl/fonts.sgml,
+ docs/tmpl/text-attributes.sgml: Changed accordingly.
+
2000-11-12 Havoc Pennington <hp@pobox.com>
* pango-config.in: Remove UNICODE_LIBS UNICODE_CFLAGS
diff --git a/ChangeLog.pre-1-0 b/ChangeLog.pre-1-0
index 2ebb604e..ad4b077b 100644
--- a/ChangeLog.pre-1-0
+++ b/ChangeLog.pre-1-0
@@ -1,3 +1,17 @@
+2000-11-13 Sebastian Wilhelmi <wilhelmi@ira.uka.de>
+
+ * pango/pango-attributes.c, pango/pango-attributes.h: Renamed
+ pango_attribute_compare to pango_attribute_equal. Renamed compare
+ member of PangoAttrClass to equal. Renamed some static functions
+ from ..._compare to ..._equal.
+
+ * pango/fonts.c, pango/pango-font.h, pango/pango-context.c:
+ Renamed pango_font_description_compare to
+ pango_font_description_equal.
+
+ * docs/pango-sections.txt, docs/tmpl/fonts.sgml,
+ docs/tmpl/text-attributes.sgml: Changed accordingly.
+
2000-11-12 Havoc Pennington <hp@pobox.com>
* pango-config.in: Remove UNICODE_LIBS UNICODE_CFLAGS
diff --git a/ChangeLog.pre-1-10 b/ChangeLog.pre-1-10
index 2ebb604e..ad4b077b 100644
--- a/ChangeLog.pre-1-10
+++ b/ChangeLog.pre-1-10
@@ -1,3 +1,17 @@
+2000-11-13 Sebastian Wilhelmi <wilhelmi@ira.uka.de>
+
+ * pango/pango-attributes.c, pango/pango-attributes.h: Renamed
+ pango_attribute_compare to pango_attribute_equal. Renamed compare
+ member of PangoAttrClass to equal. Renamed some static functions
+ from ..._compare to ..._equal.
+
+ * pango/fonts.c, pango/pango-font.h, pango/pango-context.c:
+ Renamed pango_font_description_compare to
+ pango_font_description_equal.
+
+ * docs/pango-sections.txt, docs/tmpl/fonts.sgml,
+ docs/tmpl/text-attributes.sgml: Changed accordingly.
+
2000-11-12 Havoc Pennington <hp@pobox.com>
* pango-config.in: Remove UNICODE_LIBS UNICODE_CFLAGS
diff --git a/ChangeLog.pre-1-2 b/ChangeLog.pre-1-2
index 2ebb604e..ad4b077b 100644
--- a/ChangeLog.pre-1-2
+++ b/ChangeLog.pre-1-2
@@ -1,3 +1,17 @@
+2000-11-13 Sebastian Wilhelmi <wilhelmi@ira.uka.de>
+
+ * pango/pango-attributes.c, pango/pango-attributes.h: Renamed
+ pango_attribute_compare to pango_attribute_equal. Renamed compare
+ member of PangoAttrClass to equal. Renamed some static functions
+ from ..._compare to ..._equal.
+
+ * pango/fonts.c, pango/pango-font.h, pango/pango-context.c:
+ Renamed pango_font_description_compare to
+ pango_font_description_equal.
+
+ * docs/pango-sections.txt, docs/tmpl/fonts.sgml,
+ docs/tmpl/text-attributes.sgml: Changed accordingly.
+
2000-11-12 Havoc Pennington <hp@pobox.com>
* pango-config.in: Remove UNICODE_LIBS UNICODE_CFLAGS
diff --git a/ChangeLog.pre-1-4 b/ChangeLog.pre-1-4
index 2ebb604e..ad4b077b 100644
--- a/ChangeLog.pre-1-4
+++ b/ChangeLog.pre-1-4
@@ -1,3 +1,17 @@
+2000-11-13 Sebastian Wilhelmi <wilhelmi@ira.uka.de>
+
+ * pango/pango-attributes.c, pango/pango-attributes.h: Renamed
+ pango_attribute_compare to pango_attribute_equal. Renamed compare
+ member of PangoAttrClass to equal. Renamed some static functions
+ from ..._compare to ..._equal.
+
+ * pango/fonts.c, pango/pango-font.h, pango/pango-context.c:
+ Renamed pango_font_description_compare to
+ pango_font_description_equal.
+
+ * docs/pango-sections.txt, docs/tmpl/fonts.sgml,
+ docs/tmpl/text-attributes.sgml: Changed accordingly.
+
2000-11-12 Havoc Pennington <hp@pobox.com>
* pango-config.in: Remove UNICODE_LIBS UNICODE_CFLAGS
diff --git a/ChangeLog.pre-1-6 b/ChangeLog.pre-1-6
index 2ebb604e..ad4b077b 100644
--- a/ChangeLog.pre-1-6
+++ b/ChangeLog.pre-1-6
@@ -1,3 +1,17 @@
+2000-11-13 Sebastian Wilhelmi <wilhelmi@ira.uka.de>
+
+ * pango/pango-attributes.c, pango/pango-attributes.h: Renamed
+ pango_attribute_compare to pango_attribute_equal. Renamed compare
+ member of PangoAttrClass to equal. Renamed some static functions
+ from ..._compare to ..._equal.
+
+ * pango/fonts.c, pango/pango-font.h, pango/pango-context.c:
+ Renamed pango_font_description_compare to
+ pango_font_description_equal.
+
+ * docs/pango-sections.txt, docs/tmpl/fonts.sgml,
+ docs/tmpl/text-attributes.sgml: Changed accordingly.
+
2000-11-12 Havoc Pennington <hp@pobox.com>
* pango-config.in: Remove UNICODE_LIBS UNICODE_CFLAGS
diff --git a/ChangeLog.pre-1-8 b/ChangeLog.pre-1-8
index 2ebb604e..ad4b077b 100644
--- a/ChangeLog.pre-1-8
+++ b/ChangeLog.pre-1-8
@@ -1,3 +1,17 @@
+2000-11-13 Sebastian Wilhelmi <wilhelmi@ira.uka.de>
+
+ * pango/pango-attributes.c, pango/pango-attributes.h: Renamed
+ pango_attribute_compare to pango_attribute_equal. Renamed compare
+ member of PangoAttrClass to equal. Renamed some static functions
+ from ..._compare to ..._equal.
+
+ * pango/fonts.c, pango/pango-font.h, pango/pango-context.c:
+ Renamed pango_font_description_compare to
+ pango_font_description_equal.
+
+ * docs/pango-sections.txt, docs/tmpl/fonts.sgml,
+ docs/tmpl/text-attributes.sgml: Changed accordingly.
+
2000-11-12 Havoc Pennington <hp@pobox.com>
* pango-config.in: Remove UNICODE_LIBS UNICODE_CFLAGS
diff --git a/docs/pango-sections.txt b/docs/pango-sections.txt
index fcad5d6c..35b91770 100644
--- a/docs/pango-sections.txt
+++ b/docs/pango-sections.txt
@@ -94,7 +94,7 @@ PangoWeight
PangoVariant
PangoStretch
pango_font_description_copy
-pango_font_description_compare
+pango_font_description_equal
pango_font_descriptions_free
pango_font_description_free
pango_font_description_from_string
@@ -146,7 +146,7 @@ PangoAttrShape
pango_parse_markup
pango_attr_type_register
pango_attribute_copy
-pango_attribute_compare
+pango_attribute_equal
pango_attribute_destroy
<SUBSECTION>
pango_attr_lang_new
diff --git a/docs/tmpl/fonts.sgml b/docs/tmpl/fonts.sgml
index 502286ad..9db61d79 100644
--- a/docs/tmpl/fonts.sgml
+++ b/docs/tmpl/fonts.sgml
@@ -89,7 +89,7 @@ within a family.
@Returns:
-<!-- ##### FUNCTION pango_font_description_compare ##### -->
+<!-- ##### FUNCTION pango_font_description_equal ##### -->
<para>
</para>
diff --git a/docs/tmpl/text-attributes.sgml b/docs/tmpl/text-attributes.sgml
index 0bf3ea3b..80a5bba1 100644
--- a/docs/tmpl/text-attributes.sgml
+++ b/docs/tmpl/text-attributes.sgml
@@ -53,7 +53,7 @@ provided for #PangoAttribute.
@type: the type ID for this attribute
@copy: function to duplicate an attribute of this type (see pango_attribute_copy())
@destroy: function to free an attribute of this type (see pango_attribute_destroy())
-@compare: function to compare two attributes of this type (see pango_attribute_compare())
+@equal: function to compare two attributes of this type (see pango_attribute_equal())
<!-- ##### STRUCT PangoAttribute ##### -->
<para>
@@ -134,7 +134,7 @@ sets all aspects of the font description at once.
@Returns:
-<!-- ##### FUNCTION pango_attribute_compare ##### -->
+<!-- ##### FUNCTION pango_attribute_equal ##### -->
<para>
</para>
diff --git a/pango/fonts.c b/pango/fonts.c
index 1757301a..ed27e646 100644
--- a/pango/fonts.c
+++ b/pango/fonts.c
@@ -48,7 +48,7 @@ pango_font_description_copy (const PangoFontDescription *desc)
}
/**
- * pango_font_description_compare:
+ * pango_font_description_equal:
* @desc1: a #PangoFontDescription
* @desc2: another #PangoFontDescription
*
@@ -60,8 +60,8 @@ pango_font_description_copy (const PangoFontDescription *desc)
* %FALSE.)
**/
gboolean
-pango_font_description_compare (const PangoFontDescription *desc1,
- const PangoFontDescription *desc2)
+pango_font_description_equal (const PangoFontDescription *desc1,
+ const PangoFontDescription *desc2)
{
g_return_val_if_fail (desc1 != NULL, FALSE);
g_return_val_if_fail (desc2 != NULL, FALSE);
diff --git a/pango/pango-attributes.c b/pango/pango-attributes.c
index f241ff09..afcd8530 100644
--- a/pango/pango-attributes.c
+++ b/pango/pango-attributes.c
@@ -103,7 +103,7 @@ pango_attribute_destroy (PangoAttribute *attr)
}
/**
- * pango_attribute_compare:
+ * pango_attribute_equal:
* @attr1: a #PangoAttribute
* @attr2: another #PangoAttribute
*
@@ -114,8 +114,8 @@ pango_attribute_destroy (PangoAttribute *attr)
* Return value: %TRUE if the two attributes have the same value.
**/
gboolean
-pango_attribute_compare (const PangoAttribute *attr1,
- const PangoAttribute *attr2)
+pango_attribute_equal (const PangoAttribute *attr1,
+ const PangoAttribute *attr2)
{
g_return_val_if_fail (attr1 != NULL, FALSE);
g_return_val_if_fail (attr2 != NULL, FALSE);
@@ -123,7 +123,7 @@ pango_attribute_compare (const PangoAttribute *attr1,
if (attr1->klass->type != attr2->klass->type)
return FALSE;
- return attr1->klass->compare (attr1, attr2);
+ return attr1->klass->equal (attr1, attr2);
}
static PangoAttribute *
@@ -140,8 +140,8 @@ pango_attr_string_destroy (PangoAttribute *attr)
}
static gboolean
-pango_attr_string_compare (const PangoAttribute *attr1,
- const PangoAttribute *attr2)
+pango_attr_string_equal (const PangoAttribute *attr1,
+ const PangoAttribute *attr2)
{
return strcmp (((PangoAttrString *)attr1)->value, ((PangoAttrString *)attr2)->value) == 0;
}
@@ -173,7 +173,7 @@ pango_attr_lang_new (const char *lang)
PANGO_ATTR_LANG,
pango_attr_string_copy,
pango_attr_string_destroy,
- pango_attr_string_compare
+ pango_attr_string_equal
};
g_return_val_if_fail (lang != NULL, NULL);
@@ -196,7 +196,7 @@ pango_attr_family_new (const char *family)
PANGO_ATTR_FAMILY,
pango_attr_string_copy,
pango_attr_string_destroy,
- pango_attr_string_compare
+ pango_attr_string_equal
};
g_return_val_if_fail (family != NULL, NULL);
@@ -220,8 +220,8 @@ pango_attr_color_destroy (PangoAttribute *attr)
}
static gboolean
-pango_attr_color_compare (const PangoAttribute *attr1,
- const PangoAttribute *attr2)
+pango_attr_color_equal (const PangoAttribute *attr1,
+ const PangoAttribute *attr2)
{
const PangoAttrColor *color_attr1 = (const PangoAttrColor *)attr1;
const PangoAttrColor *color_attr2 = (const PangoAttrColor *)attr2;
@@ -265,7 +265,7 @@ pango_attr_foreground_new (guint16 red,
PANGO_ATTR_FOREGROUND,
pango_attr_color_copy,
pango_attr_color_destroy,
- pango_attr_color_compare
+ pango_attr_color_equal
};
return pango_attr_color_new (&klass, red, green, blue);
@@ -290,7 +290,7 @@ pango_attr_background_new (guint16 red,
PANGO_ATTR_BACKGROUND,
pango_attr_color_copy,
pango_attr_color_destroy,
- pango_attr_color_compare
+ pango_attr_color_equal
};
return pango_attr_color_new (&klass, red, green, blue);
@@ -311,8 +311,8 @@ pango_attr_int_destroy (PangoAttribute *attr)
}
static gboolean
-pango_attr_int_compare (const PangoAttribute *attr1,
- const PangoAttribute *attr2)
+pango_attr_int_equal (const PangoAttribute *attr1,
+ const PangoAttribute *attr2)
{
const PangoAttrInt *int_attr1 = (const PangoAttrInt *)attr1;
const PangoAttrInt *int_attr2 = (const PangoAttrInt *)attr2;
@@ -346,8 +346,8 @@ pango_attr_float_destroy (PangoAttribute *attr)
}
static gboolean
-pango_attr_float_compare (const PangoAttribute *attr1,
- const PangoAttribute *attr2)
+pango_attr_float_equal (const PangoAttribute *attr1,
+ const PangoAttribute *attr2)
{
const PangoAttrFloat *float_attr1 = (const PangoAttrFloat *)attr1;
const PangoAttrFloat *float_attr2 = (const PangoAttrFloat *)attr2;
@@ -381,7 +381,7 @@ pango_attr_size_new (int size)
PANGO_ATTR_SIZE,
pango_attr_int_copy,
pango_attr_int_destroy,
- pango_attr_int_compare
+ pango_attr_int_equal
};
return pango_attr_int_new (&klass, size);
@@ -402,7 +402,7 @@ pango_attr_style_new (PangoStyle style)
PANGO_ATTR_STYLE,
pango_attr_int_copy,
pango_attr_int_destroy,
- pango_attr_int_compare
+ pango_attr_int_equal
};
return pango_attr_int_new (&klass, (int)style);
@@ -423,7 +423,7 @@ pango_attr_weight_new (PangoWeight weight)
PANGO_ATTR_WEIGHT,
pango_attr_int_copy,
pango_attr_int_destroy,
- pango_attr_int_compare
+ pango_attr_int_equal
};
return pango_attr_int_new (&klass, (int)weight);
@@ -444,7 +444,7 @@ pango_attr_variant_new (PangoVariant variant)
PANGO_ATTR_VARIANT,
pango_attr_int_copy,
pango_attr_int_destroy,
- pango_attr_int_compare
+ pango_attr_int_equal
};
return pango_attr_int_new (&klass, (int)variant);
@@ -465,7 +465,7 @@ pango_attr_stretch_new (PangoStretch stretch)
PANGO_ATTR_STRETCH,
pango_attr_int_copy,
pango_attr_int_destroy,
- pango_attr_int_compare
+ pango_attr_int_equal
};
return pango_attr_int_new (&klass, (int)stretch);
@@ -489,13 +489,13 @@ pango_attr_font_desc_destroy (PangoAttribute *attr)
}
static gboolean
-pango_attr_font_desc_compare (const PangoAttribute *attr1,
- const PangoAttribute *attr2)
+pango_attr_font_desc_equal (const PangoAttribute *attr1,
+ const PangoAttribute *attr2)
{
const PangoAttrFontDesc *desc_attr1 = (const PangoAttrFontDesc *)attr1;
const PangoAttrFontDesc *desc_attr2 = (const PangoAttrFontDesc *)attr2;
- return pango_font_description_compare (&desc_attr1->desc, &desc_attr2->desc);
+ return pango_font_description_equal (&desc_attr1->desc, &desc_attr2->desc);
}
/**
@@ -515,7 +515,7 @@ pango_attr_font_desc_new (const PangoFontDescription *desc)
PANGO_ATTR_FONT_DESC,
pango_attr_font_desc_copy,
pango_attr_font_desc_destroy,
- pango_attr_font_desc_compare
+ pango_attr_font_desc_equal
};
PangoAttrFontDesc *result = g_new (PangoAttrFontDesc, 1);
@@ -542,7 +542,7 @@ pango_attr_underline_new (PangoUnderline underline)
PANGO_ATTR_UNDERLINE,
pango_attr_int_copy,
pango_attr_int_destroy,
- pango_attr_int_compare
+ pango_attr_int_equal
};
return pango_attr_int_new (&klass, (int)underline);
@@ -563,7 +563,7 @@ pango_attr_strikethrough_new (gboolean strikethrough)
PANGO_ATTR_STRIKETHROUGH,
pango_attr_int_copy,
pango_attr_int_destroy,
- pango_attr_int_compare
+ pango_attr_int_equal
};
return pango_attr_int_new (&klass, (int)strikethrough);
@@ -586,7 +586,7 @@ pango_attr_rise_new (int rise)
PANGO_ATTR_RISE,
pango_attr_int_copy,
pango_attr_int_destroy,
- pango_attr_int_compare
+ pango_attr_int_equal
};
return pango_attr_int_new (&klass, (int)rise);
@@ -608,7 +608,7 @@ pango_attr_scale_new (double scale_factor)
PANGO_ATTR_SCALE,
pango_attr_float_copy,
pango_attr_float_destroy,
- pango_attr_float_compare
+ pango_attr_float_equal
};
return pango_attr_float_new (&klass, scale_factor);
@@ -629,8 +629,8 @@ pango_attr_shape_destroy (PangoAttribute *attr)
}
static gboolean
-pango_attr_shape_compare (const PangoAttribute *attr1,
- const PangoAttribute *attr2)
+pango_attr_shape_equal (const PangoAttribute *attr1,
+ const PangoAttribute *attr2)
{
const PangoAttrShape *shape_attr1 = (const PangoAttrShape *)attr1;
const PangoAttrShape *shape_attr2 = (const PangoAttrShape *)attr2;
@@ -665,7 +665,7 @@ pango_attr_shape_new (const PangoRectangle *ink_rect,
PANGO_ATTR_SHAPE,
pango_attr_shape_copy,
pango_attr_shape_destroy,
- pango_attr_shape_compare
+ pango_attr_shape_equal
};
PangoAttrShape *result;
@@ -934,7 +934,7 @@ pango_attr_list_change (PangoAttrList *list,
tmp_attr->end_index >= start_index)
{
/* We overlap with an existing attribute */
- if (pango_attribute_compare (tmp_attr, attr))
+ if (pango_attribute_equal (tmp_attr, attr))
{
/* We can merge the new attribute with this attribute
*/
@@ -1002,7 +1002,7 @@ pango_attr_list_change (PangoAttrList *list,
else if (tmp_attr->klass->type == attr->klass->type)
{
if (tmp_attr->end_index <= attr->end_index ||
- pango_attribute_compare (tmp_attr, attr))
+ pango_attribute_equal (tmp_attr, attr))
{
/* We can merge the new attribute with this attribute.
*/
diff --git a/pango/pango-attributes.h b/pango/pango-attributes.h
index fb9e204a..d7859441 100644
--- a/pango/pango-attributes.h
+++ b/pango/pango-attributes.h
@@ -79,7 +79,7 @@ struct _PangoAttrClass
PangoAttrType type;
PangoAttribute * (*copy) (const PangoAttribute *attr);
void (*destroy) (PangoAttribute *attr);
- gboolean (*compare) (const PangoAttribute *attr1, const PangoAttribute *attr2);
+ gboolean (*equal) (const PangoAttribute *attr1, const PangoAttribute *attr2);
};
struct _PangoAttrString
@@ -125,7 +125,7 @@ PangoAttrType pango_attr_type_register (const gchar *name);
PangoAttribute * pango_attribute_copy (const PangoAttribute *attr);
void pango_attribute_destroy (PangoAttribute *attr);
-gboolean pango_attribute_compare (const PangoAttribute *attr1,
+gboolean pango_attribute_equal (const PangoAttribute *attr1,
const PangoAttribute *attr2);
PangoAttribute *pango_attr_lang_new (const char *lang);
diff --git a/pango/pango-context.c b/pango/pango-context.c
index 082344d9..0e9f7146 100644
--- a/pango/pango-context.c
+++ b/pango/pango-context.c
@@ -891,7 +891,7 @@ add_engines (PangoContext *context,
&next_desc, &extra_attrs);
if (i == 0 ||
- !pango_font_description_compare (&current_desc, &next_desc))
+ !pango_font_description_equal (&current_desc, &next_desc))
{
current_desc = next_desc;
diff --git a/pango/pango-font.h b/pango/pango-font.h
index 8a56b4c9..9425d5cf 100644
--- a/pango/pango-font.h
+++ b/pango/pango-font.h
@@ -93,7 +93,7 @@ struct _PangoFontMetrics
};
PangoFontDescription *pango_font_description_copy (const PangoFontDescription *desc);
-gboolean pango_font_description_compare (const PangoFontDescription *desc1,
+gboolean pango_font_description_equal (const PangoFontDescription *desc1,
const PangoFontDescription *desc2);
void pango_font_description_free (PangoFontDescription *desc);
void pango_font_descriptions_free (PangoFontDescription **descs,
View Lorry Controller Status