Bug 449543 - Ship pangoatsui.h

2007-06-24  Richard Hult  <richard@imendio.com>

	Bug 449543 - Ship pangoatsui.h

	* pango/pangoatsui-fontmap.c:
	* pango/pangoatsui-private.h:
	* pango/pangoatsui.c:
	* pango/pangoatsui.h:
	* pango/pangocairo-atsuifont.c:
	* pango/pangocairo-atsuifont.h: Move get_atsu_font_id from the
	cairo atsui font class to the atsui base class. Make the members
	of the atsui font private and adapt all users of them.

	* pango/Makefile.am: Ship pangoatsui.h.

	* modules/basic/basic-atsui.c: (basic_engine_shape): Adapt to the
	above changes.

svn path=/trunk/; revision=2366

1 files changed, 21 insertions, 33 deletions

diff --git a/pango/pangoatsui-private.h b/pango/pangoatsui-private.h
index d0a1ebff..f88f0060 100644
--- a/pango/pangoatsui-private.h
+++ b/pango/pangoatsui-private.h
@@ -25,6 +25,7 @@
 
 #include <pango/pango-fontmap.h>
 #include <pango/pango-context.h>
+#include "pangoatsui.h"
 
 G_BEGIN_DECLS
 
@@ -35,22 +36,12 @@ G_BEGIN_DECLS
 #define PANGO_IS_ATSUI_FONT_MAP_CLASS(klass)  (G_TYPE_CHECK_CLASS_TYPE ((klass), PANGO_TYPE_ATSUI_FONT_MAP))
 #define PANGO_ATSUI_FONT_MAP_GET_CLASS(obj)   (G_TYPE_INSTANCE_GET_CLASS ((obj), PANGO_TYPE_ATSUI_FONT_MAP, PangoATSUIFontMapClass))
 
-#define PANGO_TYPE_ATSUI_FONT            (pango_atsui_font_get_type ())
-#define PANGO_ATSUI_FONT(object)         (G_TYPE_CHECK_INSTANCE_CAST ((object), PANGO_TYPE_ATSUI_FONT, PangoATSUIFont))
-#define PANGO_ATSUI_FONT_CLASS(klass)    (G_TYPE_CHECK_CLASS_CAST ((klass), PANGO_TYPE_ATSUI_FONT, PangoATSUIFontClass))
-#define PANGO_ATSUI_IS_FONT(object)      (G_TYPE_CHECK_INSTANCE_TYPE ((object), PANGO_TYPE_ATSUI_FONT))
-#define PANGO_ATSUI_IS_FONT_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), PANGO_TYPE_ATSUI_FONT))
-#define PANGO_ATSUI_FONT_GET_CLASS(obj)  (G_TYPE_INSTANCE_GET_CLASS ((obj), PANGO_TYPE_ATSUI_FONT, PangoATSUIFontClass))
-
-#define PANGO_RENDER_TYPE_ATSUI "PangoRenderATSUI"
 
 typedef struct _PangoATSUIFamily       PangoATSUIFamily;
 typedef struct _PangoATSUIFace         PangoATSUIFace;
 
 typedef struct _PangoATSUIFontMap      PangoATSUIFontMap;
 typedef struct _PangoATSUIFontMapClass PangoATSUIFontMapClass;
-typedef struct _PangoATSUIFont         PangoATSUIFont;
-typedef struct _PangoATSUIFontClass    PangoATSUIFontClass;
 
 struct _PangoATSUIFontMap
 {
@@ -83,30 +74,27 @@ struct _PangoATSUIFontMapClass
 				      const PangoFontDescription *desc);
 };
 
-struct _PangoATSUIFont
-{
-  PangoFont parent_instance;
-
-  PangoATSUIFace *face;
-  PangoFontDescription *desc;
-  PangoMatrix matrix;
-  gpointer context_key;
-
-  PangoFontMap *fontmap;
-};
-
-struct _PangoATSUIFontClass
-{
-  PangoFontClass parent_class;
-};
-
-GType pango_atsui_font_map_get_type (void) G_GNUC_CONST;
-GType pango_atsui_font_get_type (void) G_GNUC_CONST;
 
-const char *   _pango_atsui_face_get_postscript_name  (PangoATSUIFace *face);
-PangoCoverage *_pango_atsui_face_get_coverage         (PangoATSUIFace *face,
-						       PangoLanguage  *language);
-gboolean       _pango_atsui_face_get_synthetic_italic (PangoATSUIFace *face);
+GType                 pango_atsui_font_map_get_type          (void) G_GNUC_CONST;
+
+const char *          _pango_atsui_face_get_postscript_name  (PangoATSUIFace    *face);
+PangoCoverage *       _pango_atsui_face_get_coverage         (PangoATSUIFace    *face,
+                                                              PangoLanguage     *language);
+gboolean              _pango_atsui_face_get_synthetic_italic (PangoATSUIFace    *face);
+
+void                  _pango_atsui_font_set_font_description (PangoATSUIFont    *afont,
+                                                              const PangoFontDescription *desc);
+PangoFontDescription *_pango_atsui_font_get_font_description (PangoATSUIFont    *afont);
+void                  _pango_atsui_font_set_font_map         (PangoATSUIFont    *afont,
+                                                              PangoATSUIFontMap *fontmap);
+void                  _pango_atsui_font_set_face             (PangoATSUIFont    *afont, 
+                                                              PangoATSUIFace    *aface);
+PangoATSUIFace *      _pango_atsui_font_get_face             (PangoATSUIFont    *font);
+gpointer              _pango_atsui_font_get_context_key      (PangoATSUIFont    *afont);
+void                  _pango_atsui_font_set_context_key      (PangoATSUIFont    *afont,
+                                                              gpointer           context_key);
+void                  _pango_atsui_font_set_atsu_font_id     (PangoATSUIFont    *font,
+                                                              ATSUFontID         font_id);
 
 G_END_DECLS