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

7 files changed, 42 insertions, 11 deletions

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>