From 8a22bba574379d0c6bd8129cd61390fcb36dd67e Mon Sep 17 00:00:00 2001 From: Emmanuele Bassi Date: Tue, 14 Apr 2020 18:22:41 +0100 Subject: Skip introspection on low level API We don't have introspection for fontconfig and freetype2 data types. While we do have introspection for Harfbuzz, it doesn't really work. --- pango/pangofc-font.c | 6 +++--- pango/pangofc-fontmap.c | 25 +++++++++++++++++++------ pango/pangoft2.c | 13 ++++++------- pango/pangoxft-font.c | 26 +++++++++++++------------- 4 files changed, 41 insertions(+), 29 deletions(-) diff --git a/pango/pangofc-font.c b/pango/pangofc-font.c index 72b9931d..4b6a34f7 100644 --- a/pango/pangofc-font.c +++ b/pango/pangofc-font.c @@ -533,14 +533,14 @@ pango_fc_font_real_get_glyph (PangoFcFont *font, } /** - * pango_fc_font_lock_face: + * pango_fc_font_lock_face: (skip) * @font: a #PangoFcFont. * - * Gets the FreeType FT_Face associated with a font, + * Gets the FreeType `FT_Face` associated with a font, * This face will be kept around until you call * pango_fc_font_unlock_face(). * - * Return value: the FreeType FT_Face associated with @font. + * Return value: the FreeType `FT_Face` associated with @font. * * Since: 1.4 * Deprecated: 1.44: Use pango_font_get_hb_font() instead diff --git a/pango/pangofc-fontmap.c b/pango/pangofc-fontmap.c index 9ecea09b..b0c8365d 100644 --- a/pango/pangofc-fontmap.c +++ b/pango/pangofc-fontmap.c @@ -2021,9 +2021,9 @@ pango_fc_font_map_config_changed (PangoFcFontMap *fcfontmap) } /** - * pango_fc_font_map_set_config: + * pango_fc_font_map_set_config: (skip) * @fcfontmap: a #PangoFcFontMap - * @fcconfig: (nullable): a #FcConfig, or %NULL + * @fcconfig: (nullable): a `FcConfig`, or %NULL * * Set the FcConfig for this font map to use. The default value * is %NULL, which causes Fontconfig to use its global "current config". @@ -2065,12 +2065,14 @@ pango_fc_font_map_set_config (PangoFcFontMap *fcfontmap, } /** - * pango_fc_font_map_get_config: + * pango_fc_font_map_get_config: (skip) * @fcfontmap: a #PangoFcFontMap * - * Fetches FcConfig attached to a font map. See pango_fc_font_map_set_config(). + * Fetches the `FcConfig` attached to a font map. * - * Returns: (nullable): the #FcConfig object attached to @fcfontmap, which + * See also: pango_fc_font_map_set_config() + * + * Returns: (nullable): the `FcConfig` object attached to @fcfontmap, which * might be %NULL. * * Since: 1.38 @@ -2247,7 +2249,7 @@ _pango_fc_font_map_fc_to_coverage (FcCharSet *charset) * needed for correct operation on the #PangoContext after calling * this function. * - * Return value: a new #PangoContext + * Return value: (transfer full): a new #PangoContext * * Since: 1.4 * @@ -2940,6 +2942,17 @@ pango_fc_family_init (PangoFcFamily *fcfamily) fcfamily->n_faces = -1; } +/** + * pango_fc_font_map_get_hb_face: (skip) + * @fcfontmap: a #PangoFcFontMap + * @fcfont: a #PangoFcFont + * + * Retrieves the `hb_face_t` for the given #PangoFcFont. + * + * Returns: (transfer none) (nullable): the `hb_face_t` for the given Pango font + * + * Since: 1.44 + */ hb_face_t * pango_fc_font_map_get_hb_face (PangoFcFontMap *fcfontmap, PangoFcFont *fcfont) diff --git a/pango/pangoft2.c b/pango/pangoft2.c index b6467981..2fe49171 100644 --- a/pango/pangoft2.c +++ b/pango/pangoft2.c @@ -159,19 +159,18 @@ set_transform (PangoFT2Font *ft2font) } /** - * pango_ft2_font_get_face: + * pango_ft2_font_get_face: (skip) * @font: a #PangoFont * - * Returns the native FreeType2 FT_Face structure used for this #PangoFont. + * Returns the native FreeType2 `FT_Face` structure used for this #PangoFont. * This may be useful if you want to use FreeType2 functions directly. * * Use pango_fc_font_lock_face() instead; when you are done with a * face from pango_fc_font_lock_face() you must call * pango_fc_font_unlock_face(). * - * Return value: (nullable): a pointer to a FT_Face - * structure, with the size set correctly, or %NULL if - * @font is %NULL. + * Return value: (nullable): a pointer to a `FT_Face` structure, with the + * size set correctly, or %NULL if @font is %NULL. **/ FT_Face pango_ft2_font_get_face (PangoFont *font) @@ -476,10 +475,10 @@ pango_ft2_font_finalize (GObject *object) /** * pango_ft2_font_get_coverage: - * @font: a PangoFT2Font. + * @font: a Pango FT2 font * @language: a language tag. * - * Gets the #PangoCoverage for a PangoFT2Font. Use + * Gets the #PangoCoverage for a `PangoFT2Font`. Use * pango_font_get_coverage() instead. * * Return value: (transfer full): a #PangoCoverage. diff --git a/pango/pangoxft-font.c b/pango/pangoxft-font.c index 2526b13d..45418c15 100644 --- a/pango/pangoxft-font.c +++ b/pango/pangoxft-font.c @@ -499,13 +499,13 @@ pango_xft_font_real_shutdown (PangoFcFont *fcfont) } /** - * pango_xft_font_get_font: + * pango_xft_font_get_font: (skip) * @font: (nullable): a #PangoFont. * - * Returns the XftFont of a font. + * Returns the `XftFont` of a font. * - * Return value: (nullable): the XftFont associated to @font, or %NULL - * if @font is %NULL. + * Return value: (nullable): the `XftFont` associated to @font, + * or %NULL if @font is %NULL. **/ XftFont * pango_xft_font_get_font (PangoFont *font) @@ -517,12 +517,12 @@ pango_xft_font_get_font (PangoFont *font) } /** - * pango_xft_font_get_display: + * pango_xft_font_get_display: (skip) * @font: a #PangoFont. * - * Returns the X display of the XftFont of a font. + * Returns the X display of the `XftFont` of a font. * - * Return value: the X display of the XftFont associated to @font. + * Return value: (transfer none): the X display of the XftFont associated to @font. **/ Display * pango_xft_font_get_display (PangoFont *font) @@ -560,16 +560,16 @@ pango_xft_font_get_unknown_glyph (PangoFont *font, } /** - * pango_xft_font_lock_face: + * pango_xft_font_lock_face: (skip) * @font: a #PangoFont. * - * Gets the FreeType FT_Face associated with a font, - * This face will be kept around until you call - * pango_xft_font_unlock_face(). + * Gets the FreeType `FT_Face` associated with a font. + * + * This face will be kept around until you call pango_xft_font_unlock_face(). * * Use pango_fc_font_lock_face() instead. * - * Return value: the FreeType FT_Face associated with @font. + * Return value: the FreeType `FT_Face` associated with @font. * * Since: 1.2 **/ @@ -582,7 +582,7 @@ pango_xft_font_lock_face (PangoFont *font) } /** - * pango_xft_font_unlock_face: + * pango_xft_font_unlock_face: (skip) * @font: a #PangoFont. * * Releases a font previously obtained with -- cgit v1.2.1