summaryrefslogtreecommitdiff
path: root/src/cairo-user-font.c
diff options
context:
space:
mode:
authorBehdad Esfahbod <behdad@behdad.org>2008-06-05 19:19:27 -0400
committerBehdad Esfahbod <behdad@behdad.org>2008-06-05 19:19:27 -0400
commitadcfe8335629e76f2ad12432d90d94fec12871c0 (patch)
treea0bbc68acd29906d077bfb2fd7e22e35b9e9edcf /src/cairo-user-font.c
parent6702c7edc4a6e3e1129d8c6e6b4989ba2410add4 (diff)
[user-font] Reorder methods to the order they should appear in docs
Diffstat (limited to 'src/cairo-user-font.c')
-rw-r--r--src/cairo-user-font.c52
1 files changed, 26 insertions, 26 deletions
diff --git a/src/cairo-user-font.c b/src/cairo-user-font.c
index a09343db..8d59c386 100644
--- a/src/cairo-user-font.c
+++ b/src/cairo-user-font.c
@@ -534,12 +534,12 @@ cairo_user_font_face_set_render_glyph_func (cairo_font_face_t
}
/**
- * cairo_user_font_face_set_unicode_to_glyph_func:
+ * cairo_user_font_face_set_text_to_glyphs_func:
* @font_face: A user font face
- * @unicode_to_glyph_func: The unicode_to_glyph callback, or %NULL
+ * @text_to_glyphs_func: The text_to_glyphs callback, or %NULL
*
- * Sets the unicode-to-glyph conversion function of a user-font.
- * See #cairo_user_scaled_font_unicode_to_glyph_func_t for details of how the callback
+ * Sets th text-to-glyphs conversion function of a user-font.
+ * See #cairo_user_scaled_font_text_to_glyphs_func_t for details of how the callback
* works.
*
* The font-face should not be immutable or a %CAIRO_STATUS_USER_FONT_IMMUTABLE
@@ -549,8 +549,8 @@ cairo_user_font_face_set_render_glyph_func (cairo_font_face_t
* Since: 1.8
**/
void
-cairo_user_font_face_set_unicode_to_glyph_func (cairo_font_face_t *font_face,
- cairo_user_scaled_font_unicode_to_glyph_func_t unicode_to_glyph_func)
+cairo_user_font_face_set_text_to_glyphs_func (cairo_font_face_t *font_face,
+ cairo_user_scaled_font_text_to_glyphs_func_t text_to_glyphs_func)
{
cairo_user_font_face_t *user_font_face = (cairo_user_font_face_t *) font_face;
if (! _cairo_font_face_is_user (font_face)) {
@@ -561,16 +561,16 @@ cairo_user_font_face_set_unicode_to_glyph_func (cairo_font_face_t
if (_cairo_font_face_set_error (font_face, CAIRO_STATUS_USER_FONT_IMMUTABLE))
return;
}
- user_font_face->scaled_font_methods.unicode_to_glyph = unicode_to_glyph_func;
+ user_font_face->scaled_font_methods.text_to_glyphs = text_to_glyphs_func;
}
/**
- * cairo_user_font_face_set_text_to_glyphs_func:
+ * cairo_user_font_face_set_unicode_to_glyph_func:
* @font_face: A user font face
- * @text_to_glyphs_func: The text_to_glyphs callback, or %NULL
+ * @unicode_to_glyph_func: The unicode_to_glyph callback, or %NULL
*
- * Sets th text-to-glyphs conversion function of a user-font.
- * See #cairo_user_scaled_font_text_to_glyphs_func_t for details of how the callback
+ * Sets the unicode-to-glyph conversion function of a user-font.
+ * See #cairo_user_scaled_font_unicode_to_glyph_func_t for details of how the callback
* works.
*
* The font-face should not be immutable or a %CAIRO_STATUS_USER_FONT_IMMUTABLE
@@ -580,8 +580,8 @@ cairo_user_font_face_set_unicode_to_glyph_func (cairo_font_face_t
* Since: 1.8
**/
void
-cairo_user_font_face_set_text_to_glyphs_func (cairo_font_face_t *font_face,
- cairo_user_scaled_font_text_to_glyphs_func_t text_to_glyphs_func)
+cairo_user_font_face_set_unicode_to_glyph_func (cairo_font_face_t *font_face,
+ cairo_user_scaled_font_unicode_to_glyph_func_t unicode_to_glyph_func)
{
cairo_user_font_face_t *user_font_face = (cairo_user_font_face_t *) font_face;
if (! _cairo_font_face_is_user (font_face)) {
@@ -592,7 +592,7 @@ cairo_user_font_face_set_text_to_glyphs_func (cairo_font_face_t
if (_cairo_font_face_set_error (font_face, CAIRO_STATUS_USER_FONT_IMMUTABLE))
return;
}
- user_font_face->scaled_font_methods.text_to_glyphs = text_to_glyphs_func;
+ user_font_face->scaled_font_methods.unicode_to_glyph = unicode_to_glyph_func;
}
/* User-font method getters */
@@ -642,45 +642,45 @@ cairo_user_font_face_get_render_glyph_func (cairo_font_face_t *font_face)
}
/**
- * cairo_user_font_face_get_unicode_to_glyph_func:
+ * cairo_user_font_face_get_text_to_glyphs_func:
* @font_face: A user font face
*
- * Gets the unicode-to-glyph conversion function of a user-font.
+ * Gets the text-to-glyphs conversion function of a user-font.
*
- * Return value: The unicode_to_glyph callback of @font_face
+ * Return value: The text_to_glyphs callback of @font_face
* or %NULL if none set.
*
* Since: 1.8
**/
-cairo_user_scaled_font_unicode_to_glyph_func_t
-cairo_user_font_face_get_unicode_to_glyph_func (cairo_font_face_t *font_face)
+cairo_user_scaled_font_text_to_glyphs_func_t
+cairo_user_font_face_get_text_to_glyphs_func (cairo_font_face_t *font_face)
{
cairo_user_font_face_t *user_font_face = (cairo_user_font_face_t *) font_face;
if (! _cairo_font_face_is_user (font_face)) {
if (_cairo_font_face_set_error (font_face, CAIRO_STATUS_FONT_TYPE_MISMATCH))
return NULL;
}
- return user_font_face->scaled_font_methods.unicode_to_glyph;
+ return user_font_face->scaled_font_methods.text_to_glyphs;
}
/**
- * cairo_user_font_face_get_text_to_glyphs_func:
+ * cairo_user_font_face_get_unicode_to_glyph_func:
* @font_face: A user font face
*
- * Gets the text-to-glyphs conversion function of a user-font.
+ * Gets the unicode-to-glyph conversion function of a user-font.
*
- * Return value: The text_to_glyphs callback of @font_face
+ * Return value: The unicode_to_glyph callback of @font_face
* or %NULL if none set.
*
* Since: 1.8
**/
-cairo_user_scaled_font_text_to_glyphs_func_t
-cairo_user_font_face_get_text_to_glyphs_func (cairo_font_face_t *font_face)
+cairo_user_scaled_font_unicode_to_glyph_func_t
+cairo_user_font_face_get_unicode_to_glyph_func (cairo_font_face_t *font_face)
{
cairo_user_font_face_t *user_font_face = (cairo_user_font_face_t *) font_face;
if (! _cairo_font_face_is_user (font_face)) {
if (_cairo_font_face_set_error (font_face, CAIRO_STATUS_FONT_TYPE_MISMATCH))
return NULL;
}
- return user_font_face->scaled_font_methods.text_to_glyphs;
+ return user_font_face->scaled_font_methods.unicode_to_glyph;
}