diff options
| author | Anders Carlsson <andersca@imendio.com> | 2005-11-22 09:12:05 +0000 |
|---|---|---|
| committer | Anders Carlsson <andersca@src.gnome.org> | 2005-11-22 09:12:05 +0000 |
| commit | c830201fcd8fb1d63c20fcefc70d36c24e54187d (patch) | |
| tree | 4c4bc101cec5be62b2c7d24a57dd001ed815fa74 /pango/pangocairo-fontmap.c | |
| parent | a319318a43a3b85d349d22ba8a0a1e1cbda61ac9 (diff) | |
| download | pango-c830201fcd8fb1d63c20fcefc70d36c24e54187d.tar.gz | |
Add checks for ATSUI.
2005-11-21 Anders Carlsson <andersca@imendio.com>
* configure.in:
Add checks for ATSUI.
* examples/Makefile.am:
Only build pango-cairoview if freetype is detected.
* modules/basic/Makefile.am:
Add basic ATSUI module.
* pango/Makefile.am:
Add ATSUI files for cairo backend.
* pango/pangocairo-fontmap.c:
(pango_cairo_font_map_new):
Support creating ATSUI font maps here.
* pango/pangoatsui-fontmap.c:
* pango/pangoatsui-private.h:
* pango/pangoatsui.c:
* pango/pangoatsui.h:
* pango/pangocairo-atsui.h:
* pango/pangocairo-atsuifont.c:
* pango/pangocairo-atsuifont.h:
* pango/pangocairo-atsuifontmap.c:
Add.
Diffstat (limited to 'pango/pangocairo-fontmap.c')
| -rw-r--r-- | pango/pangocairo-fontmap.c | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/pango/pangocairo-fontmap.c b/pango/pangocairo-fontmap.c index 80a72b2f..501592d5 100644 --- a/pango/pangocairo-fontmap.c +++ b/pango/pangocairo-fontmap.c @@ -24,7 +24,9 @@ #include "pangocairo.h" #include "pangocairo-private.h" -#if defined (HAVE_CAIRO_FREETYPE) +#if defined (HAVE_CAIRO_ATSUI) +# include "pangocairo-atsui.h" +#elif defined (HAVE_CAIRO_FREETYPE) # include "pangocairo-fc.h" #elif defined (HAVE_CAIRO_WIN32) # include "pangocairo-win32.h" @@ -86,7 +88,9 @@ pango_cairo_font_map_new (void) /* Make sure that the type system is initialized */ g_type_init (); -#if defined(HAVE_CAIRO_WIN32) +#if defined(HAVE_CAIRO_ATSUI) + return g_object_new (PANGO_TYPE_CAIRO_ATSUI_FONT_MAP, NULL); +#elif defined(HAVE_CAIRO_WIN32) return g_object_new (PANGO_TYPE_CAIRO_WIN32_FONT_MAP, NULL); #elif defined(HAVE_CAIRO_FREETYPE) return g_object_new (PANGO_TYPE_CAIRO_FC_FONT_MAP, NULL); |