Doc fixups

Move TYPE macros to standard sections.

2 files changed, 42 insertions, 59 deletions

diff --git a/docs/pango-sections.txt b/docs/pango-sections.txt
index c179633b..c875b91f 100644
--- a/docs/pango-sections.txt
+++ b/docs/pango-sections.txt
@@ -7,7 +7,6 @@ PangoAnalysis
 PANGO_ANALYSIS_FLAG_CENTERED_BASELINE
 PANGO_ANALYSIS_FLAG_IS_ELLIPSIS
 PANGO_ANALYSIS_FLAG_NEED_HYPHEN
-PANGO_TYPE_DIRECTION
 
 <SUBSECTION>
 pango_itemize
@@ -34,6 +33,7 @@ PangoShapeFlags
 pango_shape_with_flags
 
 <SUBSECTION Standard>
+PANGO_TYPE_DIRECTION
 PANGO_TYPE_ITEM
 
 <SUBSECTION Private>
@@ -100,7 +100,6 @@ PANGO_LBEARING
 PANGO_RBEARING
 pango_extents_to_pixels
 PangoMatrix
-PANGO_TYPE_MATRIX
 PANGO_MATRIX_INIT
 pango_matrix_copy
 pango_matrix_free
@@ -126,7 +125,6 @@ PangoGlyphVisAttr
 PangoGlyphString
 PangoGlyphItem
 PangoGlyphItemIter
-PANGO_TYPE_GLYPH_STRING
 pango_glyph_string_new
 pango_glyph_string_copy
 pango_glyph_string_set_size
@@ -137,14 +135,12 @@ pango_glyph_string_get_width
 pango_glyph_string_index_to_x
 pango_glyph_string_x_to_index
 pango_glyph_string_get_logical_widths
-PANGO_TYPE_GLYPH_ITEM
 pango_glyph_item_copy
 pango_glyph_item_free
 pango_glyph_item_split
 pango_glyph_item_apply_attrs
 pango_glyph_item_letter_space
 pango_glyph_item_get_logical_widths
-PANGO_TYPE_GLYPH_ITEM_ITER
 pango_glyph_item_iter_copy
 pango_glyph_item_iter_free
 pango_glyph_item_iter_init_start
@@ -152,7 +148,11 @@ pango_glyph_item_iter_init_end
 pango_glyph_item_iter_next_cluster
 pango_glyph_item_iter_prev_cluster
 
+PANGO_TYPE_GLYPH_STRING
 <SUBSECTION Private>
+PANGO_TYPE_GLYPH_ITEM
+PANGO_TYPE_GLYPH_ITEM_ITER
+PANGO_TYPE_MATRIX
 pango_glyph_string_get_type
 pango_glyph_item_get_type
 pango_glyph_item_iter_get_type
@@ -193,17 +193,11 @@ PangoCoveragePrivate
 <TITLE>Fonts</TITLE>
 <FILE>fonts</FILE>
 PangoFontDescription
-PANGO_TYPE_FONT_DESCRIPTION
 PangoStyle
-PANGO_TYPE_STYLE
 PangoWeight
-PANGO_TYPE_WEIGHT
 PangoVariant
-PANGO_TYPE_VARIANT
 PangoStretch
-PANGO_TYPE_STRETCH
 PangoFontMask
-PANGO_TYPE_FONT_MASK
 pango_font_description_new
 pango_font_description_copy
 pango_font_description_copy_static
@@ -241,7 +235,6 @@ pango_font_description_to_string
 pango_font_description_to_filename
 <SUBSECTION>
 PangoFontMetrics
-PANGO_TYPE_FONT_METRICS
 pango_font_metrics_ref
 pango_font_metrics_unref
 pango_font_metrics_get_ascent
@@ -255,9 +248,6 @@ pango_font_metrics_get_strikethrough_thickness
 pango_font_metrics_get_strikethrough_position
 <SUBSECTION>
 PangoFont
-PANGO_TYPE_FONT
-PANGO_FONT
-PANGO_IS_FONT
 pango_font_find_shaper
 pango_font_describe
 pango_font_describe_with_absolute_size
@@ -270,31 +260,19 @@ pango_font_get_features
 pango_font_get_hb_font
 <SUBSECTION>
 PangoFontFamily
-PANGO_TYPE_FONT_FAMILY
-PANGO_FONT_FAMILY
-PANGO_IS_FONT_FAMILY
 pango_font_family_get_name
 pango_font_family_is_monospace
 pango_font_family_is_variable
 pango_font_family_list_faces
 <SUBSECTION>
 PangoFontFace
-PANGO_TYPE_FONT_FACE
-PANGO_FONT_FACE
-PANGO_IS_FONT_FACE
 pango_font_face_get_face_name
 pango_font_face_list_sizes
 pango_font_face_describe
 pango_font_face_is_synthesized
 <SUBSECTION>
 PangoFontMap
-PANGO_TYPE_FONT_MAP
-PANGO_FONT_MAP
-PANGO_IS_FONT_MAP
 PangoFontMapClass
-PANGO_FONT_MAP_CLASS
-PANGO_IS_FONT_MAP_CLASS
-PANGO_FONT_MAP_GET_CLASS
 pango_font_map_create_context
 pango_font_map_load_font
 pango_font_map_load_fontset
@@ -303,7 +281,6 @@ pango_font_map_get_serial
 pango_font_map_changed
 <SUBSECTION>
 PangoFontset
-PANGO_TYPE_FONTSET
 PangoFontsetClass
 pango_fontset_get_font
 pango_fontset_get_metrics
@@ -311,6 +288,29 @@ PangoFontsetForeachFunc
 pango_fontset_foreach
 
 <SUBSECTION Standard>
+PANGO_TYPE_FONTSET
+PANGO_TYPE_FONT_MAP
+PANGO_FONT_MAP
+PANGO_IS_FONT_MAP
+PANGO_FONT_MAP_CLASS
+PANGO_IS_FONT_MAP_CLASS
+PANGO_FONT_MAP_GET_CLASS
+PANGO_TYPE_FONT_FAMILY
+PANGO_FONT_FAMILY
+PANGO_IS_FONT_FAMILY
+PANGO_TYPE_FONT_FACE
+PANGO_FONT_FACE
+PANGO_IS_FONT_FACE
+PANGO_TYPE_FONT_METRICS
+PANGO_TYPE_FONT
+PANGO_FONT
+PANGO_IS_FONT
+PANGO_TYPE_FONT_DESCRIPTION
+PANGO_TYPE_STYLE
+PANGO_TYPE_WEIGHT
+PANGO_TYPE_VARIANT
+PANGO_TYPE_STRETCH
+PANGO_TYPE_FONT_MASK
 PANGO_FONT_FACE_CLASS
 PANGO_IS_FONT_CLASS
 PANGO_FONT_FACE_GET_CLASS
@@ -355,7 +355,6 @@ PANGO_UNKNOWN_GLYPH_HEIGHT
 <TITLE>Text Attributes</TITLE>
 <FILE>text-attributes</FILE>
 PangoAttrType
-PANGO_TYPE_ATTR_TYPE
 PangoAttrClass
 PangoAttribute
 PANGO_ATTR_INDEX_FROM_TEXT_BEGINNING
@@ -392,7 +391,6 @@ pango_attr_strikethrough_color_new
 pango_attr_underline_new
 pango_attr_underline_color_new
 PangoUnderline
-PANGO_TYPE_UNDERLINE
 pango_attr_shape_new
 pango_attr_shape_new_with_data
 PangoAttrDataCopyFunc
@@ -417,14 +415,12 @@ pango_attr_insert_hyphens_new
 PangoShowFlags
 pango_attr_show_new
 PangoColor
-PANGO_TYPE_COLOR
 pango_color_parse
 pango_color_copy
 pango_color_free
 pango_color_to_string
 <SUBSECTION>
 PangoAttrList
-PANGO_TYPE_ATTR_LIST
 pango_attr_list_new
 pango_attr_list_ref
 pango_attr_list_unref
@@ -446,7 +442,12 @@ pango_attr_iterator_get
 pango_attr_iterator_get_font
 pango_attr_iterator_get_attrs
 pango_attr_iterator_destroy
+
 <SUBSECTION Private>
+PANGO_TYPE_ATTR_TYPE
+PANGO_TYPE_UNDERLINE
+PANGO_TYPE_COLOR
+PANGO_TYPE_ATTR_LIST
 pango_attr_type_get_type
 pango_attr_list_get_type
 pango_underline_get_type
@@ -466,9 +467,7 @@ pango_markup_parser_finish
 <TITLE>Tab Stops</TITLE>
 <FILE>tab-stops</FILE>
 PangoTabArray
-PANGO_TYPE_TAB_ARRAY
 PangoTabAlign
-PANGO_TYPE_TAB_ALIGN
 pango_tab_array_new
 pango_tab_array_new_with_positions
 pango_tab_array_copy
@@ -481,6 +480,8 @@ pango_tab_array_get_tabs
 pango_tab_array_get_positions_in_pixels
 
 <SUBSECTION Private>
+PANGO_TYPE_TAB_ARRAY
+PANGO_TYPE_TAB_ALIGN
 pango_tab_align_get_type
 pango_tab_array_get_type
 </SECTION>
@@ -514,12 +515,10 @@ pango_layout_set_wrap
 pango_layout_get_wrap
 pango_layout_is_wrapped
 PangoWrapMode
-PANGO_TYPE_WRAP_MODE
 pango_layout_set_ellipsize
 pango_layout_get_ellipsize
 pango_layout_is_ellipsized
 PangoEllipsizeMode
-PANGO_TYPE_ELLIPSIZE_MODE
 pango_layout_set_indent
 pango_layout_get_indent
 pango_layout_get_spacing
@@ -537,7 +536,6 @@ pango_layout_get_tabs
 pango_layout_set_single_paragraph_mode
 pango_layout_get_single_paragraph_mode
 PangoAlignment
-PANGO_TYPE_ALIGNMENT
 
 pango_layout_get_unknown_glyphs_count
 pango_layout_get_log_attrs
@@ -596,6 +594,9 @@ pango_layout_line_get_x_ranges
 pango_layout_line_get_height
 
 <SUBSECTION Standard>
+PANGO_TYPE_WRAP_MODE
+PANGO_TYPE_ELLIPSIZE_MODE
+PANGO_TYPE_ALIGNMENT
 PANGO_TYPE_LAYOUT
 PangoLayoutClass
 PANGO_LAYOUT
@@ -619,7 +620,6 @@ pango_ellipsize_mode_get_type
 <TITLE>Scripts and Languages</TITLE>
 <FILE>scripts</FILE>
 PangoScript
-PANGO_TYPE_SCRIPT
 PangoScriptIter
 pango_script_for_unichar
 pango_script_get_sample_language
@@ -628,7 +628,6 @@ pango_script_iter_get_range
 pango_script_iter_next
 pango_script_iter_free
 PangoLanguage
-PANGO_TYPE_LANGUAGE
 pango_language_from_string
 pango_language_to_string
 pango_language_matches
@@ -636,7 +635,10 @@ pango_language_includes_script
 pango_language_get_scripts
 pango_language_get_default
 pango_language_get_sample_string
+
 <SUBSECTION Private>
+PANGO_TYPE_LANGUAGE
+PANGO_TYPE_SCRIPT
 pango_script_get_type
 pango_language_get_type
 </SECTION>
@@ -648,7 +650,6 @@ PangoEngineInfo
 PangoEngineScriptInfo
 PangoEngine
 PangoEngineClass
-PANGO_RENDER_TYPE_NONE
 script_engine_list
 script_engine_init
 script_engine_exit
@@ -756,7 +757,6 @@ PangoRendererPrivate
 <SECTION>
 <TITLE>Win32 Fonts and Rendering</TITLE>
 <FILE>win32-fonts</FILE>
-PANGO_RENDER_TYPE_WIN32
 pango_win32_get_context
 pango_win32_render
 pango_win32_render_transformed
@@ -791,7 +791,6 @@ STRICT
 <TITLE>FreeType Fonts and Rendering</TITLE>
 <FILE>freetype-fonts</FILE>
 PangoFT2FontMap
-PANGO_RENDER_TYPE_FT2
 pango_ft2_font_map_new
 pango_ft2_font_map_set_resolution
 pango_ft2_font_map_create_context
@@ -825,7 +824,6 @@ STRICT
 <FILE>xft-fonts</FILE>
 PangoXftFont
 PangoXftFontMap
-PANGO_RENDER_TYPE_XFT
 pango_xft_get_context
 pango_xft_get_font_map
 pango_xft_set_default_substitute
@@ -919,7 +917,6 @@ pango_cairo_font_map_get_type
 <SECTION>
 <TITLE>CoreText Fonts</TITLE>
 <FILE>coretext-fonts</FILE>
-PANGO_RENDER_TYPE_CORE_TEXT
 pango_core_text_font_get_ctfont
 <SUBSECTION Standard>
 PANGO_CAIRO_CORE_TEXT_FONT
@@ -986,20 +983,6 @@ PANGO_FC_FONT_MAP_CLASS
 PANGO_IS_FC_FONT_MAP_CLASS
 PANGO_FC_FONT_MAP_GET_CLASS
 
-<SUBSECTION>
-PangoFcFontsetKey
-pango_fc_fontset_key_get_context_key
-pango_fc_fontset_key_get_description
-pango_fc_fontset_key_get_language
-pango_fc_fontset_key_get_matrix
-pango_fc_fontset_key_get_absolute_size
-pango_fc_fontset_key_get_resolution
-pango_fc_fontset_key_get_variations
-PangoFcFontKey
-pango_fc_font_key_get_context_key
-pango_fc_font_key_get_matrix
-pango_fc_font_key_get_pattern
-
 <SUBSECTION Private>
 PangoFcFontMapPrivate
 pango_fc_font_map_get_type
@@ -1011,7 +994,6 @@ pango_fc_font_map_get_type
 <TITLE>PangoFcFont</TITLE>
 PangoFcFont
 PangoFcFontClass
-PANGO_RENDER_TYPE_FC
 pango_fc_font_lock_face
 pango_fc_font_unlock_face
 pango_fc_font_has_char
diff --git a/docs/pango.types.in b/docs/pango.types.in
index f72400ce..94f5e592 100644
--- a/docs/pango.types.in
+++ b/docs/pango.types.in
@@ -4,6 +4,7 @@ pango_attr_list_get_type
 pango_attr_type_get_type
 pango_attribute_get_type
 pango_bidi_type_get_type
+pango_cairo_fc_font_get_type
 pango_cairo_fc_font_map_get_type
 pango_cairo_font_get_type
 pango_cairo_font_map_get_type