diff options
| author | Matthias Clasen <mclasen@redhat.com> | 2019-07-12 23:51:59 -0400 |
|---|---|---|
| committer | Matthias Clasen <mclasen@redhat.com> | 2019-07-12 23:51:59 -0400 |
| commit | 0ae5be87e072e984078c9ad7e1ad30cebd1bd5d1 (patch) | |
| tree | 79e03f44c05faa1aea8610ea0127a62646793f3a | |
| parent | 38832882799b337f4c47b9c9d2c8534d57d7a21e (diff) | |
| download | pango-0ae5be87e072e984078c9ad7e1ad30cebd1bd5d1.tar.gz | |
Rename pango_font_covers
We already had a has_char api in pangofc,
so use that name.
| -rw-r--r-- | docs/pango-sections.txt | 2 | ||||
| -rw-r--r-- | pango/ellipsize.c | 4 | ||||
| -rw-r--r-- | pango/fonts.c | 6 | ||||
| -rw-r--r-- | pango/pango-context.c | 4 | ||||
| -rw-r--r-- | pango/pango-font.h | 2 |
5 files changed, 8 insertions, 10 deletions
diff --git a/docs/pango-sections.txt b/docs/pango-sections.txt index 7df0dbc9..fc72a0bf 100644 --- a/docs/pango-sections.txt +++ b/docs/pango-sections.txt @@ -243,7 +243,7 @@ pango_font_find_shaper pango_font_describe pango_font_describe_with_absolute_size pango_font_get_coverage -pango_font_covers +pango_font_has_char pango_font_get_glyph_extents pango_font_get_metrics pango_font_get_font_map diff --git a/pango/ellipsize.c b/pango/ellipsize.c index 928ec744..002853c3 100644 --- a/pango/ellipsize.c +++ b/pango/ellipsize.c @@ -345,8 +345,8 @@ shape_ellipsis (EllipsizeState *state) /* If that fails we use "..." in the first matching font */ if (!item->analysis.font || - !pango_font_covers (item->analysis.font, - g_utf8_get_char (ellipsis_text))) + !pango_font_has_char (item->analysis.font, + g_utf8_get_char (ellipsis_text))) { pango_item_free (item); diff --git a/pango/fonts.c b/pango/fonts.c index b04eb497..209b6042 100644 --- a/pango/fonts.c +++ b/pango/fonts.c @@ -2308,7 +2308,7 @@ pango_font_face_list_sizes (PangoFontFace *face, } /** - * pango_font_covers: + * pango_font_has_char: * @font: a #PangoFont * @wc: a Unicode character * @@ -2319,8 +2319,8 @@ pango_font_face_list_sizes (PangoFontFace *face, * Since: 1.44 */ gboolean -pango_font_covers (PangoFont *font, - gunichar wc) +pango_font_has_char (PangoFont *font, + gunichar wc) { PangoCoverage *coverage = pango_font_get_coverage (font, pango_language_get_default ()); PangoCoverageLevel result = pango_coverage_get (coverage, wc); diff --git a/pango/pango-context.c b/pango/pango-context.c index 1cb89d4a..4b258c9c 100644 --- a/pango/pango-context.c +++ b/pango/pango-context.c @@ -1247,13 +1247,11 @@ get_font_foreach (PangoFontset *fontset, gpointer data) { GetFontInfo *info = data; - PangoCoverageLevel level; if (G_UNLIKELY (!font)) return FALSE; - level = pango_font_covers (font, info->wc); - if (level != PANGO_COVERAGE_NONE) + if (pango_font_has_char (font, info->wc)) { info->font = font; return TRUE; diff --git a/pango/pango-font.h b/pango/pango-font.h index fd5d7df4..5e49d266 100644 --- a/pango/pango-font.h +++ b/pango/pango-font.h @@ -485,7 +485,7 @@ PANGO_AVAILABLE_IN_1_10 PangoFontMap *pango_font_get_font_map (PangoFont *font); PANGO_AVAILABLE_IN_1_44 -gboolean pango_font_covers (PangoFont *font, +gboolean pango_font_has_char (PangoFont *font, gunichar wc); PANGO_AVAILABLE_IN_1_44 void pango_font_get_features (PangoFont *font, |