diff options
| author | Owen Taylor <otaylor@redhat.com> | 2003-08-03 02:35:20 +0000 |
|---|---|---|
| committer | Owen Taylor <otaylor@src.gnome.org> | 2003-08-03 02:35:20 +0000 |
| commit | 94f39b93e929db7881070f4b5e1f5dc3c106e3fb (patch) | |
| tree | 1fa92651d4e9d2c7c41d413468f37bdb8095cd52 /pango/pangoft2-private.h | |
| parent | e2ea77ce2f99c122a0087c28fcd9316be4d6e205 (diff) | |
| download | pango-94f39b93e929db7881070f4b5e1f5dc3c106e3fb.tar.gz | |
Make pangoxft depend on pangoft2.
Sat Aug 2 14:33:28 2003 Owen Taylor <otaylor@redhat.com>
* pango/Makefile.am (libpangoxft_1_0_la_LIBADD): Make
pangoxft depend on pangoft2.
* pango/pangofc-fontmap.[ch]: Make pangofc-fontmap.cI
into a real base class.
* pango/pangofc-font.[ch]: Move some of the pangoxft/
pangoft2 implementation here.
* pango/pangoft2.c pango/pangoft2-fontmap.c
pango/pangoft2-private.h pango/pangoxft-font.c
pango/pangoxft2-fontmap.c pango/pangoxft-private.h: Adapt
to the new scheme
* modules/*/Makefile.am Modules/*/*/*-fc.c: Don't build
separate FT2 and Xft shapers, just build one Fc shaper.
* docs/pango-sections.txt docs/pango-docs.sgml
docs/tmpl/pangofc-font{,map}.sgml: Basic docs for
the new stuff.
* configure.in: Up pango_module_version to 1.4.0.
Diffstat (limited to 'pango/pangoft2-private.h')
| -rw-r--r-- | pango/pangoft2-private.h | 18 |
1 files changed, 2 insertions, 16 deletions
diff --git a/pango/pangoft2-private.h b/pango/pangoft2-private.h index 71746f02..1f086832 100644 --- a/pango/pangoft2-private.h +++ b/pango/pangoft2-private.h @@ -23,7 +23,6 @@ #ifndef __PANGOFT2_PRIVATE_H__ #define __PANGOFT2_PRIVATE_H__ -#include "pango-modules.h" #include "pangoft2.h" #include <fontconfig/fontconfig.h> @@ -61,15 +60,11 @@ struct _PangoFT2Font { PangoFcFont font; - FcPattern *font_pattern; FT_Face face; int load_flags; int size; - PangoFontMap *fontmap; - PangoFontDescription *description; - GSList *metrics_by_lang; GHashTable *glyph_info; @@ -83,19 +78,10 @@ struct _PangoFT2GlyphInfo void *cached_glyph; }; -PangoFT2Font * _pango_ft2_font_new (PangoFontMap *font, - FcPattern *pattern); -PangoMap *_pango_ft2_get_shaper_map (PangoLanguage *language); -PangoCoverage *_pango_ft2_font_map_get_coverage (PangoFontMap *fontmap, - FcPattern *pattern); +PangoFT2Font * _pango_ft2_font_new (PangoFT2FontMap *ft2fontmap, + FcPattern *pattern); FT_Library _pango_ft2_font_map_get_library (PangoFontMap *fontmap); -void _pango_ft2_font_map_add (PangoFontMap *fontmap, - PangoFT2Font *ft2font); -void _pango_ft2_font_map_remove (PangoFontMap *fontmap, - PangoFT2Font *ft2font); const char *_pango_ft2_ft_strerror (FT_Error error); -PangoFontDescription *_pango_ft2_font_desc_from_pattern (FcPattern *pattern, - gboolean include_size); void *pango_ft2_font_get_cache_glyph_data (PangoFont *font, int glyph_index); |