diff options
| author | Alexander Larsson <alla@lysator.liu.se> | 2001-11-18 16:06:02 +0000 |
|---|---|---|
| committer | Alexander Larsson <alexl@src.gnome.org> | 2001-11-18 16:06:02 +0000 |
| commit | 0766534429b5830716e782418179ea63f8f1f65d (patch) | |
| tree | 1ab6b8c50e572af8320c8f3623b8135276c010f6 /pango/pango-fontmap.h | |
| parent | b12c0fb6263fd542bb03f8bb10076a0653694f12 (diff) | |
| download | pango-0766534429b5830716e782418179ea63f8f1f65d.tar.gz | |
Check for LEX and YACC. This will be made optional later, with the build
2001-11-17 Alexander Larsson <alla@lysator.liu.se>
* configure.in:
Check for LEX and YACC. This will be made optional later,
with the build sources checked in to cvs.
Generate pango/mini-xft/Makefile
* modules/basic/basic-ft2.c:
Use the new pangoft2 API.
* pango/Makefile.am:
Build mini-xft.
Add new files.
* pango/pango-context.[ch]:
Support only one fontmap per context.
Use pango_font_map_load_fontset() and PangoFontset instead
of internal fontset.
* pango/pango-fontmap.[ch]:
New virtual function pango_font_map_load_fontset() and
default implementation that uses pango_font_map_load_font().
* pango/pango-utils.[ch] (pango_lookup_aliases):
Utility function for looking up aliases. This can be
used by backend that has no backend specific aliases.
* pango/pangoft2-fontcache.c:
Removed file.
* pango/pangoft2-fontmap.c:
* pango/pangoft2-private.h:
* pango/pangoft2.c:
* pango/pangoft2.h:
Major rewrite. Doesn't handle fontsets. Uses mini-xft so that
it will always match the PangoXft backend. Simplified the
public API.
* pango/pangowin32.c:
* pango/pangox.c:
pango_context_add_font_map -> pango_context_set_font_map
* pango/pangoxft-font.c:
* pango/pangoxft-fontmap.c:
* pango/pangoxft-private.h:
New code to handle fontsets.
* pango/mini-xft/*:
Mini version of libXft from XFree86 in order to have
the pangoFT2 and pangXft backends have same config files and
generate the same fonts.
Diffstat (limited to 'pango/pango-fontmap.h')
| -rw-r--r-- | pango/pango-fontmap.h | 30 |
1 files changed, 19 insertions, 11 deletions
diff --git a/pango/pango-fontmap.h b/pango/pango-fontmap.h index eaf960f5..adc4920a 100644 --- a/pango/pango-fontmap.h +++ b/pango/pango-fontmap.h @@ -23,6 +23,7 @@ #define __PANGO_FONTMAP_H__ #include <pango/pango-font.h> +#include <pango/pango-fontset.h> G_BEGIN_DECLS @@ -32,12 +33,16 @@ G_BEGIN_DECLS typedef struct _PangoFontMap PangoFontMap; -GType pango_font_map_get_type (void) G_GNUC_CONST; -PangoFont *pango_font_map_load_font (PangoFontMap *fontmap, - const PangoFontDescription *desc); -void pango_font_map_list_families (PangoFontMap *fontmap, - PangoFontFamily ***families, - int *n_families); +GType pango_font_map_get_type (void) G_GNUC_CONST; +PangoFont * pango_font_map_load_font (PangoFontMap *fontmap, + const PangoFontDescription *desc); +PangoFontset *pango_font_map_load_fontset (PangoFontMap *fontmap, + const PangoFontDescription *desc, + PangoLanguage *language); +void pango_font_map_list_families (PangoFontMap *fontmap, + PangoFontFamily ***families, + int *n_families); + #ifdef PANGO_ENABLE_BACKEND @@ -56,11 +61,14 @@ struct _PangoFontMapClass { GObjectClass parent_class; - PangoFont *(*load_font) (PangoFontMap *fontmap, - const PangoFontDescription *desc); - void (*list_families) (PangoFontMap *fontmap, - PangoFontFamily ***families, - int *n_families); + PangoFont * (*load_font) (PangoFontMap *fontmap, + const PangoFontDescription *desc); + void (*list_families) (PangoFontMap *fontmap, + PangoFontFamily ***families, + int *n_families); + PangoFontset *(*load_fontset) (PangoFontMap *fontmap, + const PangoFontDescription *desc, + PangoLanguage *language); }; #endif /* PANGO_ENABLE_BACKEND */ |