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.

1 files changed, 6 insertions, 44 deletions

diff --git a/pango/pangoft2.h b/pango/pangoft2.h
index f2148d10..c792d797 100644
--- a/pango/pangoft2.h
+++ b/pango/pangoft2.h
@@ -31,15 +31,9 @@ G_BEGIN_DECLS
 
 #define PANGO_RENDER_TYPE_FT2 "PangoRenderFT2"
 
-/* Calls for applications
- */
-PangoContext  *pango_ft2_get_context        (void);
+/* Calls for applications */
+PangoContext  *pango_ft2_get_context        (double dpi);
 
-PangoFont     *pango_ft2_load_font          (PangoFontMap     *fontmap,
-					     FT_Open_Args    **open_args,
-					     FT_Long	      *face_indices,
-					     int               n_fonts,
-					     int               size);
 void           pango_ft2_render             (FT_Bitmap        *bitmap,
 					     PangoFont        *font,
 					     PangoGlyphString *glyphs,
@@ -54,50 +48,18 @@ void           pango_ft2_render_layout      (FT_Bitmap        *bitmap,
 					     int               x, 
 					     int               y);
 
+PangoFontMap      *pango_ft2_font_map_for_display    (void);
+void               pango_ft2_shutdown_display        (void);
 
 /* API for rendering modules
  */
-typedef guint16 PangoFT2Subfont;
-
-#define PANGO_FT2_MAKE_GLYPH(subfont,index) ((subfont)<<16 | (index))
-#define PANGO_FT2_GLYPH_SUBFONT(glyph) ((glyph)>>16)
-#define PANGO_FT2_GLYPH_INDEX(glyph) ((glyph) & 0xFFFF)
-
-int            pango_ft2_n_subfonts        (PangoFont       *font);
 PangoGlyph     pango_ft2_get_unknown_glyph (PangoFont       *font);
 int            pango_ft2_font_get_kerning  (PangoFont       *font,
 					    PangoGlyph       left,
 					    PangoGlyph       right);
-PangoCoverage *pango_ft2_get_coverage      (PangoFont       *font,
+FT_Face        pango_ft2_font_get_face     (PangoFont       *font);
+PangoCoverage *pango_ft2_font_get_coverage (PangoFont       *font,
 					    PangoLanguage   *language);
-FT_Face        pango_ft2_get_face          (PangoFont       *font,
-					    PangoFT2Subfont  subfont_index);
-
-/* API for libraries that want to use PangoFT2 mixed with classic
- * FT2 fonts.
- */
-typedef struct _PangoFT2FontCache PangoFT2FontCache;
-
-PangoFT2FontCache *pango_ft2_font_cache_new          (FT_Library         library);
-void               pango_ft2_font_cache_free         (PangoFT2FontCache *cache);
-FT_Face            pango_ft2_font_cache_load         (PangoFT2FontCache *cache,
-						      FT_Open_Args      *args,
-						      FT_Long            face_index);
-void               pango_ft2_font_cache_unload       (PangoFT2FontCache *cache,
-						      FT_Face            face);
-PangoFontMap      *pango_ft2_font_map_for_display    (void);
-void               pango_ft2_shutdown_display        (void);
-PangoFT2FontCache *pango_ft2_font_map_get_font_cache (PangoFontMap      *font_map);
-void               pango_ft2_font_subfont_open_args  (PangoFont         *font,
-						      PangoFT2Subfont    subfont_id,
-						      FT_Open_Args     **open_args,
-						      FT_Long           *face_index);
-
-
-/* Debugging.
- */
-void     pango_ft2_fontmap_dump (int           indent,
-				 PangoFontMap *fontmap);
 
 G_END_DECLS