Part of Bug 347236 – provide pango_cairo_font_get_scaled_font

2007-07-21  Behdad Esfahbod  <behdad@gnome.org>

        Part of Bug 347236 – provide pango_cairo_font_get_scaled_font

        * docs/Makefile.am:
        * docs/pango-sections.txt:
        * docs/tmpl/atsui-fonts.sgml:
        * docs/tmpl/opentype.sgml:
        * docs/tmpl/pango-engine-lang.sgml:
        * docs/tmpl/pango-engine-shape.sgml:
        * docs/tmpl/pangocairo.sgml:
        * pango/pangoatsui.h:
        * pango/pangocairo-atsuifont.h:
        * pango/pangocairo-font.c (pango_cairo_font_get_scaled_font):
        * pango/pangocairo-private.h:
        * pango/pangocairo.h:
        Export PangoCairoFont and cleanup various standard macros.


svn path=/trunk/; revision=2375

13 files changed, 84 insertions, 27 deletions

diff --git a/ChangeLog b/ChangeLog
index 9b91a248..feb1c8d5 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,23 @@
 2007-07-21  Behdad Esfahbod  <behdad@gnome.org>
 
+	Part of Bug 347236 – provide pango_cairo_font_get_scaled_font
+
+	* docs/Makefile.am:
+	* docs/pango-sections.txt:
+	* docs/tmpl/atsui-fonts.sgml:
+	* docs/tmpl/opentype.sgml:
+	* docs/tmpl/pango-engine-lang.sgml:
+	* docs/tmpl/pango-engine-shape.sgml:
+	* docs/tmpl/pangocairo.sgml:
+	* pango/pangoatsui.h:
+	* pango/pangocairo-atsuifont.h:
+	* pango/pangocairo-font.c (pango_cairo_font_get_scaled_font):
+	* pango/pangocairo-private.h:
+	* pango/pangocairo.h:
+	Export PangoCairoFont and cleanup various standard macros.
+
+2007-07-21  Behdad Esfahbod  <behdad@gnome.org>
+
 	Bug 449482 – Build error when xft not present
 
 	* docs/Makefile.am: Make docs build without xft.
diff --git a/docs/Makefile.am b/docs/Makefile.am
index 1958881d..8ef306b5 100644
--- a/docs/Makefile.am
+++ b/docs/Makefile.am
@@ -23,6 +23,7 @@ IGNORE_HFILES=			\
 	opentype		\
 	module-defs.h		\
 	modules.h		\
+	pangoatsui-private.h	\
 	pangocairo-private.h	\
 	pangocairo-fc.h		\
 	pangocairo-win32.h	\
diff --git a/docs/pango-sections.txt b/docs/pango-sections.txt
index 6b07e8c8..6b969db4 100644
--- a/docs/pango-sections.txt
+++ b/docs/pango-sections.txt
@@ -822,6 +822,7 @@ pango_xft_renderer_get_type
 <SECTION>
 <TITLE>Cairo Rendering</TITLE>
 <FILE>pangocairo</FILE>
+PangoCairoFont
 PangoCairoFontMap
 pango_cairo_font_map_get_default
 pango_cairo_font_map_new
@@ -850,25 +851,39 @@ pango_cairo_layout_line_path
 pango_cairo_layout_path
 pango_cairo_error_underline_path
 <SUBSECTION Standard>
+PANGO_CAIRO_FONT
 PANGO_CAIRO_FONT_MAP
+PANGO_IS_CAIRO_FONT
 PANGO_IS_CAIRO_FONT_MAP
+PANGO_TYPE_CAIRO_FONT
 PANGO_TYPE_CAIRO_FONT_MAP
+pango_cairo_font_get_type
 pango_cairo_font_map_get_type
 </SECTION>
 
 <SECTION>
 <TITLE>ATSUI Fonts</TITLE>
 <FILE>atsui-fonts</FILE>
-PangoCairoATSUIFont
-pango_cairo_atsui_font_get_atsu_font_id
+PANGO_RENDER_TYPE_ATSUI
+pango_atsui_font_get_atsu_font_id
 <SUBSECTION Standard>
-PangoCairoATSUIFontClass
+PANGO_ATSUI_FONT
+PANGO_ATSUI_FONT_CLASS
+PANGO_ATSUI_FONT_GET_CLASS
 PANGO_CAIRO_ATSUI_FONT
 PANGO_CAIRO_ATSUI_FONT_CLASS
 PANGO_CAIRO_ATSUI_FONT_GET_CLASS
-PANGO_CAIRO_IS_FONT_CLASS
-PANGO_RENDER_TYPE_ATSUI
+PANGO_IS_ATSUI_FONT
+PANGO_IS_ATSUI_FONT_CLASS
+PANGO_IS_CAIRO_ATSUI_FONT_CLASS
+PANGO_TYPE_ATSUI_FONT
 PANGO_TYPE_CAIRO_ATSUI_FONT
+PangoATSUIFont
+PangoATSUIFontClass
+PangoATSUIFontPrivate
+PangoCairoATSUIFont
+PangoCairoATSUIFontClass
+pango_atsui_font_get_type
 pango_cairo_atsui_font_get_type
 </SECTION>
 
diff --git a/docs/tmpl/atsui-fonts.sgml b/docs/tmpl/atsui-fonts.sgml
index 35a7404f..1a82afbf 100644
--- a/docs/tmpl/atsui-fonts.sgml
+++ b/docs/tmpl/atsui-fonts.sgml
@@ -18,11 +18,20 @@ MacOS systems using the ATSUI text rendering subsystem.
 <!-- ##### SECTION Stability_Level ##### -->
 
 
-<!-- ##### STRUCT PangoCairoATSUIFont ##### -->
+<!-- ##### MACRO PANGO_RENDER_TYPE_ATSUI ##### -->
+<para>
+A string constant identifying the ATSUI renderer. The associated quark (see
+g_quark_from_string()) is used to identify the renderer in pango_find_map().
+</para>
+
+
+
+<!-- ##### FUNCTION pango_atsui_font_get_atsu_font_id ##### -->
 <para>
 
-The #PangoCairoATSUIFont is #PangoFont used to represent
-an ATSUI font used with the cairo backend.
 </para>
 
+@font: 
+@Returns: 
+
 
diff --git a/docs/tmpl/opentype.sgml b/docs/tmpl/opentype.sgml
index dd049964..3678f178 100644
--- a/docs/tmpl/opentype.sgml
+++ b/docs/tmpl/opentype.sgml
@@ -17,7 +17,7 @@ shaping engines
 </para>
 
 <!-- ##### SECTION Stability_Level ##### -->
-Part of Pango's engine API, but stable
+Unstable
 
 <!-- ##### TYPEDEF PangoOTTag ##### -->
 <para>
diff --git a/docs/tmpl/pango-engine-lang.sgml b/docs/tmpl/pango-engine-lang.sgml
index 4a30742a..a5a91bf3 100644
--- a/docs/tmpl/pango-engine-lang.sgml
+++ b/docs/tmpl/pango-engine-lang.sgml
@@ -17,7 +17,7 @@ These engines are used in pango_break().
 </para>
 
 <!-- ##### SECTION Stability_Level ##### -->
-Part of Pango's engine API, and may change between module version changes
+Unstable
 
 <!-- ##### STRUCT PangoEngineLang ##### -->
 <para>
diff --git a/docs/tmpl/pango-engine-shape.sgml b/docs/tmpl/pango-engine-shape.sgml
index 6b2632fe..5e66f2db 100644
--- a/docs/tmpl/pango-engine-shape.sgml
+++ b/docs/tmpl/pango-engine-shape.sgml
@@ -17,7 +17,7 @@ These engines are used in pango_shape().
 </para>
 
 <!-- ##### SECTION Stability_Level ##### -->
-Part of Pango's engine API, and may change between module version changes
+Unstable
 
 <!-- ##### STRUCT PangoEngineShape ##### -->
 <para>
diff --git a/docs/tmpl/pangocairo.sgml b/docs/tmpl/pangocairo.sgml
index 8f6b5fd1..5192b975 100644
--- a/docs/tmpl/pangocairo.sgml
+++ b/docs/tmpl/pangocairo.sgml
@@ -145,6 +145,12 @@ int main (int argc, char **argv)
 <!-- ##### SECTION Stability_Level ##### -->
 
 
+<!-- ##### STRUCT PangoCairoFont ##### -->
+<para>
+
+</para>
+
+
 <!-- ##### STRUCT PangoCairoFontMap ##### -->
 <para>
 
diff --git a/pango/pangoatsui.h b/pango/pangoatsui.h
index 66ecea4b..91cbdb14 100644
--- a/pango/pangoatsui.h
+++ b/pango/pangoatsui.h
@@ -30,7 +30,7 @@ G_BEGIN_DECLS
 
 #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_IS_FONT(object) (G_TYPE_CHECK_INSTANCE_TYPE ((object), PANGO_TYPE_ATSUI_FONT))
+#define PANGO_IS_ATSUI_FONT(object) (G_TYPE_CHECK_INSTANCE_TYPE ((object), PANGO_TYPE_ATSUI_FONT))
 
 typedef struct _PangoATSUIFont         PangoATSUIFont;
 typedef struct _PangoATSUIFontClass    PangoATSUIFontClass;
@@ -42,7 +42,7 @@ typedef struct _PangoATSUIFontClass    PangoATSUIFontClass;
 #ifdef PANGO_ENABLE_BACKEND
 
 #define PANGO_ATSUI_FONT_CLASS(klass)    (G_TYPE_CHECK_CLASS_CAST ((klass), PANGO_TYPE_ATSUI_FONT, PangoATSUIFontClass))
-#define PANGO_ATSUI_IS_FONT_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), PANGO_TYPE_ATSUI_FONT))
+#define PANGO_IS_ATSUI_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))
 
 typedef struct _PangoATSUIFontPrivate  PangoATSUIFontPrivate;
diff --git a/pango/pangocairo-atsuifont.h b/pango/pangocairo-atsuifont.h
index a55a9be3..fe692788 100644
--- a/pango/pangocairo-atsuifont.h
+++ b/pango/pangocairo-atsuifont.h
@@ -25,7 +25,7 @@
 #define PANGO_TYPE_CAIRO_ATSUI_FONT           (pango_cairo_atsui_font_get_type ())
 #define PANGO_CAIRO_ATSUI_FONT(object)        (G_TYPE_CHECK_INSTANCE_CAST ((object), PANGO_TYPE_CAIRO_ATSUI_FONT, PangoCairoATSUIFont))
 #define PANGO_CAIRO_ATSUI_FONT_CLASS(klass)   (G_TYPE_CHECK_CLASS_CAST ((klass), PANGO_TYPE_CAIRO_ATSUI_FONT, PangoCairoATSUIFontClass))
-#define PANGO_CAIRO_IS_FONT_CLASS(klass)   (G_TYPE_CHECK_CLASS_TYPE ((klass), PANGO_TYPE_CAIRO_ATSUI_FONT))
+#define PANGO_IS_CAIRO_ATSUI_FONT_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), PANGO_TYPE_CAIRO_ATSUI_FONT))
 #define PANGO_CAIRO_ATSUI_FONT_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), PANGO_TYPE_CAIRO_ATSUI_FONT, PangoCairoATSUIFontClass))
 
 typedef struct _PangoCairoATSUIFont      PangoCairoATSUIFont;
diff --git a/pango/pangocairo-font.c b/pango/pangocairo-font.c
index 5349e687..3ca4073e 100644
--- a/pango/pangocairo-font.c
+++ b/pango/pangocairo-font.c
@@ -148,7 +148,7 @@ done:
  * @font: a #PangoFont from a #PangoCairoFontMap
  *
  * Gets the #cairo_scaled_font_t used by @font.
- * The scaled font can be referenced and ketp using
+ * The scaled font can be referenced and kept using
  * cairo_scaled_font_reference().
  *
  * Return value: the #cairo_scaled_font_t used by @font
@@ -156,7 +156,7 @@ done:
  * Since: 1.18
  **/
 cairo_scaled_font_t *
-pango_cairo_font_get_scaled_font (PangoFont *cfont)
+pango_cairo_font_get_scaled_font (PangoCairoFont *cfont)
 {
   PangoCairoFontPrivate *cf_priv;
 
diff --git a/pango/pangocairo-private.h b/pango/pangocairo-private.h
index 9ead7fce..05dbb5a2 100644
--- a/pango/pangocairo-private.h
+++ b/pango/pangocairo-private.h
@@ -46,11 +46,6 @@ struct _PangoCairoFontMapIface
 
 #define PANGO_CAIRO_FONT_GET_IFACE(obj) (G_TYPE_INSTANCE_GET_INTERFACE ((obj), PANGO_TYPE_CAIRO_FONT, PangoCairoFontIface))
 
-#define PANGO_TYPE_CAIRO_FONT       (pango_cairo_font_get_type ())
-#define PANGO_CAIRO_FONT(object)    (G_TYPE_CHECK_INSTANCE_CAST ((object), PANGO_TYPE_CAIRO_FONT, PangoCairoFont))
-#define PANGO_IS_CAIRO_FONT(object) (G_TYPE_CHECK_INSTANCE_TYPE ((object), PANGO_TYPE_CAIRO_FONT))
-
-typedef struct _PangoCairoFont                       PangoCairoFont;
 typedef struct _PangoCairoFontIface                  PangoCairoFontIface;
 typedef struct _PangoCairoFontPrivate                PangoCairoFontPrivate;
 typedef struct _PangoCairoFontHexBoxInfo             PangoCairoFontHexBoxInfo;
@@ -106,8 +101,6 @@ struct _PangoCairoFontIface
   gssize cf_priv_offset;
 };
 
-GType pango_cairo_font_get_type (void) G_GNUC_CONST;
-
 gboolean _pango_cairo_font_install (PangoFont *font,
 				    cairo_t   *cr);
 PangoFontMetrics * _pango_cairo_font_get_metrics (PangoFont     *font,
diff --git a/pango/pangocairo.h b/pango/pangocairo.h
index 4aa27d8a..54fe031c 100644
--- a/pango/pangocairo.h
+++ b/pango/pangocairo.h
@@ -30,6 +30,20 @@
 G_BEGIN_DECLS
 
 /**
+ * PangoCairoFont:
+ *
+ * #PangoCairoFont is an interface exported by fonts for
+ * use with Cairo. The actual type of the font will depend
+ * on the particular font technology Cairo was compiled to use.
+ *
+ * Since: 1.18
+ **/
+typedef struct _PangoCairoFont      PangoCairoFont;
+#define PANGO_TYPE_CAIRO_FONT       (pango_cairo_font_get_type ())
+#define PANGO_CAIRO_FONT(object)    (G_TYPE_CHECK_INSTANCE_CAST ((object), PANGO_TYPE_CAIRO_FONT, PangoCairoFont))
+#define PANGO_IS_CAIRO_FONT(object) (G_TYPE_CHECK_INSTANCE_TYPE ((object), PANGO_TYPE_CAIRO_FONT))
+
+/**
  * PangoCairoFontMap:
  *
  * #PangoCairoFontMap is an interface exported by font maps for
@@ -38,12 +52,11 @@ G_BEGIN_DECLS
  *
  * Since: 1.10
  **/
+typedef struct _PangoCairoFontMap        PangoCairoFontMap;
 #define PANGO_TYPE_CAIRO_FONT_MAP       (pango_cairo_font_map_get_type ())
 #define PANGO_CAIRO_FONT_MAP(object)    (G_TYPE_CHECK_INSTANCE_CAST ((object), PANGO_TYPE_CAIRO_FONT_MAP, PangoCairoFontMap))
 #define PANGO_IS_CAIRO_FONT_MAP(object) (G_TYPE_CHECK_INSTANCE_TYPE ((object), PANGO_TYPE_CAIRO_FONT_MAP))
 
-typedef struct _PangoCairoFontMap      PangoCairoFontMap;
-
 typedef void (* PangoCairoShapeRendererFunc) (cairo_t        *cr,
 					      PangoAttrShape *attr,
 					      gboolean        do_path,
@@ -65,9 +78,11 @@ double        pango_cairo_font_map_get_resolution (PangoCairoFontMap *fontmap);
 PangoContext *pango_cairo_font_map_create_context (PangoCairoFontMap *fontmap);
 
 /*
- * PangoFont methods available to PangoCairo fonts
+ * PangoCairoFont
  */
-cairo_scaled_font_t *pango_cairo_font_get_scaled_font (PangoFont *font);
+GType         pango_cairo_font_get_type               (void) G_GNUC_CONST;
+
+cairo_scaled_font_t *pango_cairo_font_get_scaled_font (PangoCairoFont *font);
 
 /* Update a Pango context for the current state of a cairo context
  */