diff options
| -rw-r--r-- | ChangeLog | 12 | ||||
| -rw-r--r-- | ChangeLog.pre-1-10 | 12 | ||||
| -rw-r--r-- | ChangeLog.pre-1-2 | 12 | ||||
| -rw-r--r-- | ChangeLog.pre-1-4 | 12 | ||||
| -rw-r--r-- | ChangeLog.pre-1-6 | 12 | ||||
| -rw-r--r-- | ChangeLog.pre-1-8 | 12 | ||||
| -rw-r--r-- | pango/pangoft2-fontmap.c | 41 | ||||
| -rw-r--r-- | pango/pangowin32.c | 9 | ||||
| -rw-r--r-- | pango/pangoxft-font.c | 8 | ||||
| -rw-r--r-- | pango/pangoxft-fontmap.c | 16 |
10 files changed, 140 insertions, 6 deletions
@@ -1,3 +1,15 @@ +2002-11-28 Matthias Clasen <maclas@gmx.de> + + * pango/pangoxft-fontmap.c: + * pango/pangoxft-font.c: + * pango/pangowin32.c: + * pango/pangoft2-fontmap.c: Mark 1.2 API additions, fix some + doc comments. + + * pango/pangoft2-fontmap.c + (pango_ft2_font_map_set_default_substitute): Implement this + function. (#99850) + 2002-11-26 Sebastian Wilhelmi <wilhelmi@ira.uka.de> * configure.in: Do not add GLIB_CFLAGS to CFLAGS. diff --git a/ChangeLog.pre-1-10 b/ChangeLog.pre-1-10 index 9373c2fd..8d3812b0 100644 --- a/ChangeLog.pre-1-10 +++ b/ChangeLog.pre-1-10 @@ -1,3 +1,15 @@ +2002-11-28 Matthias Clasen <maclas@gmx.de> + + * pango/pangoxft-fontmap.c: + * pango/pangoxft-font.c: + * pango/pangowin32.c: + * pango/pangoft2-fontmap.c: Mark 1.2 API additions, fix some + doc comments. + + * pango/pangoft2-fontmap.c + (pango_ft2_font_map_set_default_substitute): Implement this + function. (#99850) + 2002-11-26 Sebastian Wilhelmi <wilhelmi@ira.uka.de> * configure.in: Do not add GLIB_CFLAGS to CFLAGS. diff --git a/ChangeLog.pre-1-2 b/ChangeLog.pre-1-2 index 9373c2fd..8d3812b0 100644 --- a/ChangeLog.pre-1-2 +++ b/ChangeLog.pre-1-2 @@ -1,3 +1,15 @@ +2002-11-28 Matthias Clasen <maclas@gmx.de> + + * pango/pangoxft-fontmap.c: + * pango/pangoxft-font.c: + * pango/pangowin32.c: + * pango/pangoft2-fontmap.c: Mark 1.2 API additions, fix some + doc comments. + + * pango/pangoft2-fontmap.c + (pango_ft2_font_map_set_default_substitute): Implement this + function. (#99850) + 2002-11-26 Sebastian Wilhelmi <wilhelmi@ira.uka.de> * configure.in: Do not add GLIB_CFLAGS to CFLAGS. diff --git a/ChangeLog.pre-1-4 b/ChangeLog.pre-1-4 index 9373c2fd..8d3812b0 100644 --- a/ChangeLog.pre-1-4 +++ b/ChangeLog.pre-1-4 @@ -1,3 +1,15 @@ +2002-11-28 Matthias Clasen <maclas@gmx.de> + + * pango/pangoxft-fontmap.c: + * pango/pangoxft-font.c: + * pango/pangowin32.c: + * pango/pangoft2-fontmap.c: Mark 1.2 API additions, fix some + doc comments. + + * pango/pangoft2-fontmap.c + (pango_ft2_font_map_set_default_substitute): Implement this + function. (#99850) + 2002-11-26 Sebastian Wilhelmi <wilhelmi@ira.uka.de> * configure.in: Do not add GLIB_CFLAGS to CFLAGS. diff --git a/ChangeLog.pre-1-6 b/ChangeLog.pre-1-6 index 9373c2fd..8d3812b0 100644 --- a/ChangeLog.pre-1-6 +++ b/ChangeLog.pre-1-6 @@ -1,3 +1,15 @@ +2002-11-28 Matthias Clasen <maclas@gmx.de> + + * pango/pangoxft-fontmap.c: + * pango/pangoxft-font.c: + * pango/pangowin32.c: + * pango/pangoft2-fontmap.c: Mark 1.2 API additions, fix some + doc comments. + + * pango/pangoft2-fontmap.c + (pango_ft2_font_map_set_default_substitute): Implement this + function. (#99850) + 2002-11-26 Sebastian Wilhelmi <wilhelmi@ira.uka.de> * configure.in: Do not add GLIB_CFLAGS to CFLAGS. diff --git a/ChangeLog.pre-1-8 b/ChangeLog.pre-1-8 index 9373c2fd..8d3812b0 100644 --- a/ChangeLog.pre-1-8 +++ b/ChangeLog.pre-1-8 @@ -1,3 +1,15 @@ +2002-11-28 Matthias Clasen <maclas@gmx.de> + + * pango/pangoxft-fontmap.c: + * pango/pangoxft-font.c: + * pango/pangowin32.c: + * pango/pangoft2-fontmap.c: Mark 1.2 API additions, fix some + doc comments. + + * pango/pangoft2-fontmap.c + (pango_ft2_font_map_set_default_substitute): Implement this + function. (#99850) + 2002-11-26 Sebastian Wilhelmi <wilhelmi@ira.uka.de> * configure.in: Do not add GLIB_CFLAGS to CFLAGS. diff --git a/pango/pangoft2-fontmap.c b/pango/pangoft2-fontmap.c index 0c7d2c6d..c9c28aa1 100644 --- a/pango/pangoft2-fontmap.c +++ b/pango/pangoft2-fontmap.c @@ -119,10 +119,12 @@ static PangoFT2FontMap *pango_ft2_global_fontmap = NULL; * to cache information about available fonts, and holds * certain global parameters such as the resolution and * the default substitute function (see - * pango_font_map_set_default_substitute ()). + * pango_font_map_set_default_substitute()). * * Return value: the newly created fontmap object. Unref - * with g_object_unref when you are finished with it. + * with g_object_unref() when you are finished with it. + * + * Since: 1.2 **/ PangoFontMap * pango_ft2_font_map_new (void) @@ -158,6 +160,37 @@ pango_ft2_font_map_new (void) } /** + * pango_ft2_fontmap_set_default_substitute: + * @fontmap: a #PangoFT2FontMap + * @func: function to call to to do final config tweaking + * on #FcPattern objects. + * @data: data to pass to @func + * @notify: function to call when @data is no longer used. + * + * Sets a function that will be called to do final configuration + * substitution on a #FcPattern before it is used to load + * the font. This function can be used to do things like set + * hinting and antiasing options. + * + * Since: 1.2 + **/ +void +pango_ft2_font_map_set_default_substitute (PangoFT2FontMap *fontmap, + PangoFT2SubstituteFunc func, + gpointer data, + GDestroyNotify notify) +{ + if (fontmap->substitute_destroy) + fontmap->substitute_destroy (fontmap->substitute_data); + + fontmap->substitute_func = func; + fontmap->substitute_data = data; + fontmap->substitute_destroy = notify; + + pango_fc_clear_fontset_hash_list (fontmap); +} + +/** * pango_ft2_font_map_substitute_changed: * @fontmap: a #PangoFT2Fontmap * @@ -166,6 +199,8 @@ pango_ft2_font_map_new (void) * pango_ft2_font_map_set_default_substitute() change. * That is, if your subsitution function will return different * results for the same input pattern, you must call this function. + * + * Since: 1.2 **/ void pango_ft2_font_map_substitute_changed (PangoFT2FontMap *fontmap) @@ -201,6 +236,8 @@ pango_ft2_font_map_set_resolution (PangoFT2FontMap *fontmap, * Create a #PangoContext for the given fontmap. * * Return value: the newly created context; free with g_object_unref(). + * + * Since: 1.2 **/ PangoContext * pango_ft2_font_map_create_context (PangoFT2FontMap *fontmap) diff --git a/pango/pangowin32.c b/pango/pangowin32.c index bebcf927..20fcc985 100644 --- a/pango/pangowin32.c +++ b/pango/pangowin32.c @@ -203,6 +203,15 @@ pango_win32_get_dc (void) return pango_win32_hdc; } +/** + * pango_win32_get_debug_flag: + * + * Returns wether debugging is turned on. + * + * Returns: %TRUE if debugging is turned on. + * + * Since: 1.2 + */ gboolean pango_win32_get_debug_flag (void) { diff --git a/pango/pangoxft-font.c b/pango/pangoxft-font.c index 47eb2ec9..f2d799d0 100644 --- a/pango/pangoxft-font.c +++ b/pango/pangoxft-font.c @@ -794,6 +794,8 @@ pango_xft_font_get_unknown_glyph (PangoFont *font, * pango_xft_font_unlock_face(). * * Returns: the FreeType FT_Face associated with @font. + * + * Since: 1.2 **/ FT_Face pango_xft_font_lock_face (PangoFont *font) @@ -813,6 +815,8 @@ pango_xft_font_lock_face (PangoFont *font) * * Releases a font previously obtained with * pango_xft_font_lock_face(). + * + * Since: 1.2 **/ void pango_xft_font_unlock_face (PangoFont *font) @@ -837,6 +841,8 @@ pango_xft_font_unlock_face (PangoFont *font) * * Return value: the glyph index, or 0, if the unicode * codepoint doesn't exist in the font. + * + * Since: 1.2 **/ guint pango_xft_font_get_glyph (PangoFont *font, @@ -859,6 +865,8 @@ pango_xft_font_get_glyph (PangoFont *font, * Determines whether @font has a glyph for the codepoint @wc. * * Return value: %TRUE if @font has the requested codepoint. + * + * Since: 1.2 **/ gboolean pango_xft_font_has_char (PangoFont *font, diff --git a/pango/pangoxft-fontmap.c b/pango/pangoxft-fontmap.c index b61c2edf..f5a50fb3 100644 --- a/pango/pangoxft-fontmap.c +++ b/pango/pangoxft-fontmap.c @@ -168,11 +168,13 @@ register_display (Display *display) * @display: an X display * @screen: the screen number of a screen within @display * - * Returns the PangoXftFontmap for the given display and screen. + * Returns the #PangoXftFontmap for the given display and screen. * The fontmap is owned by Pango and will be valid until * the display is closed. * * Return value: a #PangoFontMap object, owned by Pango. + * + * Since: 1.2 **/ PangoFontMap * pango_xft_get_font_map (Display *display, @@ -231,6 +233,8 @@ cleanup_font (gpointer key, * * Release any resources that have been cached for the * combination of @display and @screen. + * + * Since: 1.2 **/ void pango_xft_shutdown_display (Display *display, @@ -257,7 +261,7 @@ pango_xft_shutdown_display (Display *display, } /** - * pango_xft_font_map_set_default_substitute: + * pango_xft_set_default_substitute: * @display: an X Display * @screen: the screen number of a screen within @display * @func: function to call to to do final config tweaking @@ -269,6 +273,8 @@ pango_xft_shutdown_display (Display *display, * substitution on a #FcPattern before it is used to load * the font. This function can be used to do things like set * hinting and antiasing options. + * + * Since: 1.2 **/ void pango_xft_set_default_substitute (Display *display, @@ -290,14 +296,16 @@ pango_xft_set_default_substitute (Display *display, } /** - * pango_substitute_changed: + * pango_xft_substitute_changed: * @fontmap: a #PangoXftFontmap * * Call this function any time the results of the * default substitution function set with - * pango_xft_font_map_set_default_substitute() change. + * pango_xft_set_default_substitute() change. * That is, if your subsitution function will return different * results for the same input pattern, you must call this function. + * + * Since: 1.2 **/ void pango_xft_substitute_changed (Display *display, |