diff options
-rw-r--r-- | ChangeLog | 8 | ||||
-rw-r--r-- | docs/pango-sections.txt | 1 | ||||
-rw-r--r-- | pango/pangowin32-fontmap.c | 12 | ||||
-rw-r--r-- | pango/pangowin32.def | 1 | ||||
-rw-r--r-- | pango/pangowin32.h | 2 |
5 files changed, 14 insertions, 10 deletions
@@ -13,7 +13,7 @@ lowercase the name before looking up from the hash table. (get_family_name): Constify parameter. (get_family_name_lowercase): Not needed any longer. - (pango_win32_pango_font_description_from_logfont): New public + (pango_win32_font_description_from_logfont): New public function. Code moved from pango_win32_insert_font(). Use family name as such, don't lowercase it. (pango_win32_insert_font): Use the above new function. Don't @@ -21,8 +21,10 @@ shouldn't ever happen. We have pruned out fonts that differ only in charset already earlier. - * pango/pangowin32.h: Declare - pango_win32_pango_font_description_from_logfont(). + * pango/pangowin32.h: Declare pango_win32_font_description_from_logfont(). + + * pango/pangowin32.def + * docs/pango-sections.txt: Add it here too. 2006-02-09 Behdad Esfahbod <behdad@gnome.org> diff --git a/docs/pango-sections.txt b/docs/pango-sections.txt index deca9859..72799bcb 100644 --- a/docs/pango-sections.txt +++ b/docs/pango-sections.txt @@ -694,6 +694,7 @@ pango_win32_font_map_for_display pango_win32_shutdown_display pango_win32_font_map_get_font_cache pango_win32_font_logfont +pango_win32_font_description_from_logfont <SUBSECTION Private> STRICT diff --git a/pango/pangowin32-fontmap.c b/pango/pangowin32-fontmap.c index 3d3d643e..ea380e2f 100644 --- a/pango/pangowin32-fontmap.c +++ b/pango/pangowin32-fontmap.c @@ -621,9 +621,9 @@ get_family_name (const LOGFONT *lfp) /** * pango_win32_pango_font_description_from_logfont: - * @lfp: pointer to a LOGFONT + * @lfp: a LOGFONT * - * Creates a #PangoFontDescription from a LOGFONT. + * Creates a #PangoFontDescription that matches the specified LOGFONT. * * The face name, italicness and weight fields in the LOGFONT are used * to set up the resulting #PangoFontDescription. If the face name in @@ -633,13 +633,13 @@ get_family_name (const LOGFONT *lfp) * data. If that doesn't work, the face name is converted from the * system codepage to UTF-8 and that is used. * - * Return value: a new #PangoFontDescription that should be freed with - * pango_font_desciption_free() when no longer needed. + * Return value: the newly allocated #PangoFontDescription, which + * should be freed using pango_font_desciption_free() * * Since: 1.12 */ PangoFontDescription * -pango_win32_pango_font_description_from_logfont (const LOGFONT *lfp) +pango_win32_font_description_from_logfont (const LOGFONT *lfp) { PangoFontDescription *description; gchar *family; @@ -765,7 +765,7 @@ pango_win32_insert_font (PangoWin32FontMap *win32fontmap, PING(("g_slist_length(size_info->logfonts)=%d", g_slist_length(size_info->logfonts))); win32face = g_object_new (PANGO_WIN32_TYPE_FACE, NULL); - win32face->description = pango_win32_pango_font_description_from_logfont (lfp2); + win32face->description = pango_win32_font_description_from_logfont (lfp2); win32face->cached_fonts = NULL; diff --git a/pango/pangowin32.def b/pango/pangowin32.def index 5ca614ba..65d62c4f 100644 --- a/pango/pangowin32.def +++ b/pango/pangowin32.def @@ -3,6 +3,7 @@ EXPORTS pango_win32_font_cache_load pango_win32_font_cache_new pango_win32_font_cache_unload + pango_win32_font_description_from_logfont pango_win32_font_entry_get_coverage pango_win32_font_entry_remove pango_win32_font_get_glyph_index diff --git a/pango/pangowin32.h b/pango/pangowin32.h index dc1aef14..986f3a11 100644 --- a/pango/pangowin32.h +++ b/pango/pangowin32.h @@ -106,7 +106,7 @@ PangoWin32FontCache *pango_win32_font_map_get_font_cache (PangoFontMap *fo LOGFONT *pango_win32_font_logfont (PangoFont *font); -PangoFontDescription *pango_win32_pango_font_description_from_logfont (const LOGFONT *lfp); +PangoFontDescription *pango_win32_font_description_from_logfont (const LOGFONT *lfp); G_END_DECLS |