ignore-glob (pango_default_break): ignore

	* pango.override (*_get_type, *_ref, *_unref, *_free): ignore-glob
	(pango_default_break): ignore

	* pango.defs (pango_attr_shape_new_with_data, pango_default_break)
	(pango_context_get_font_map, pango_context_set_matrix)
	(pango_context_get_matrix, pango_itemize_with_base_dir)
	(pango_coverage_new, pango_glyph_item_split, pango_glyph_item_free)
	(pango_glyph_item_apply_attrs, pango_glyph_item_letter_space)
	(pango_item_get_type, pango_item_new, pango_item_copy)
	(pango_item_free, pango_item_split, pango_script_for_unichar)
	(pango_script_iter_new, pango_script_iter_get_range)
	(pango_script_iter_next, pango_script_iter_free)
	(pango_script_get_sample_language, pango_script_includes_script)
	(pango_matrix_get_type, pango_matrix_copy, pango_matrix_free)
	(pango_matrix_translate, pango_matrix_scale, pango_matrix_rotate)
	(pango_matrix_concat, pango_get_mirror_char, pango_unichar_direction)
	(pango_find_base_dir): Add. Add virtuals.
	(pango_font_metrics_new, pango_find_map, pango_map_get_engine)
	(pango_map_get_engines, pango_module_register): Add with ifdef
	PANGO_ENABLE_BACKEND
	(pango_split_file_list, pango_trim_string, pango_read_line)
	(pango_skip_space, pango_scan_word, pango_scan_string)
	(pango_scan_int, pango_config_key_get, pango_lookup_aliases)
	(pango_parse_style, pango_parse_variant, pango_parse_weight)
	(pango_parse_stretch, pango_get_sysconf_subdirectory)
	(pango_get_lib_subdirectory, pango_log2vis_get_embedding_levels)
	(pango_get_sample_string, pango_is_zero_width): Add with ifdef
	USE_PANGO_UTILS

	* pango-types.defs (WrapMode): Add PANGO_WRAP_WORD_CHAR. Reorganize.

1 files changed, 272 insertions, 164 deletions

diff --git a/pango-types.defs b/pango-types.defs
index ddbd3691..2f9e734a 100644
--- a/pango-types.defs
+++ b/pango-types.defs
@@ -1,70 +1,4 @@
 ;; -*- scheme -*-
-; object definitions ...
-
-(define-object Context
-  (in-module "Pango")
-  (parent "GObject")
-  (c-name "PangoContext")
-  (gtype-id "PANGO_TYPE_CONTEXT")
-)
-
-(define-object Font
-  (in-module "Pango")
-  (parent "GObject")
-  (c-name "PangoFont")
-  (gtype-id "PANGO_TYPE_FONT")
-)
-
-(define-object FontFace
-  (in-module "Pango")
-  (parent "GObject")
-  (c-name "PangoFontFace")
-  (gtype-id "PANGO_TYPE_FONT_FACE")
-)
-
-(define-object FontFamily
-  (in-module "Pango")
-  (parent "GObject")
-  (c-name "PangoFontFamily")
-  (gtype-id "PANGO_TYPE_FONT_FAMILY")
-)
-
-(define-object FontMap
-  (in-module "Pango")
-  (parent "GObject")
-  (c-name "PangoFontMap")
-  (gtype-id "PANGO_TYPE_FONT_MAP")
-)
-
-(define-object Fontset
-  (in-module "Pango")
-  (parent "GObject")
-  (c-name "PangoFontset")
-  (gtype-id "PANGO_TYPE_FONTSET")
-)
-
-(define-object FontsetSimple
-  (in-module "Pango")
-  (parent "PangoFontset")
-  (c-name "PangoFontsetSimple")
-  (gtype-id "PANGO_TYPE_FONTSET_SIMPLE")
-)
-
-(define-object Layout
-  (in-module "Pango")
-  (parent "GObject")
-  (c-name "PangoLayout")
-  (gtype-id "PANGO_TYPE_LAYOUT")
-)
-
-(define-object Renderer
-  (in-module "Pango")
-  (parent "GObject")
-  (c-name "PangoRenderer")
-  (gtype-id "PANGO_TYPE_RENDERER")
-)
-
-
 ;; boxed definitions ...
 
 (define-boxed AttrList
@@ -102,7 +36,7 @@
   (gtype-id "PANGO_TYPE_FONT_METRICS")
   (copy-func "pango_font_metrics_ref")
   (release-func "pango_font_metrics_unref")
-)  
+)
 
 (define-boxed GlyphString
   (in-module "Pango")
@@ -117,26 +51,6 @@
   )
 )
 
-(define-boxed Language
-  (in-module "Pango")
-  (c-name "PangoLanguage")
-  (gtype-id "PANGO_TYPE_LANGUAGE")
-)
-
-(define-boxed LayoutLine
-  (in-module "Pango")
-  (c-name "PangoLayoutLine")
-  (gtype-id "PANGO_TYPE_LAYOUT_LINE")
-  (fields
-   ; '("PangoLayout*" "layout") ;; omitted for fear of creating reference cycles
-   '("gint" "start_index")
-   '("gint" "length")
-   '("GSList*" "runs")
-   '("guint" "is_paragraph_start")
-   '("guint" "resolved_dir")
-   )
-)
-
 (define-boxed Item
   (in-module "Pango")
   (c-name "PangoItem")
@@ -154,6 +68,12 @@
   (gtype-id "PANGO_TYPE_ITEM")
 )
 
+(define-boxed Language
+  (in-module "Pango")
+  (c-name "PangoLanguage")
+  (gtype-id "PANGO_TYPE_LANGUAGE")
+)
+
 (define-boxed LayoutIter
   (in-module "Pango")
   (c-name "PangoLayoutIter")
@@ -162,6 +82,26 @@
 )
 
 
+(define-boxed LayoutLine
+  (in-module "Pango")
+  (c-name "PangoLayoutLine")
+  (gtype-id "PANGO_TYPE_LAYOUT_LINE")
+  (fields
+   ; '("PangoLayout*" "layout") ;; omitted for fear of creating reference cycles
+   '("gint" "start_index")
+   '("gint" "length")
+   '("GSList*" "runs")
+   '("guint" "is_paragraph_start")
+   '("guint" "resolved_dir")
+   )
+)
+
+(define-boxed Matrix
+  (in-module "Pango")
+  (c-name "PangoMatrix")
+  (gtype-id "PANGO_TYPE_MATRIX")
+)
+
 (define-boxed TabArray
   (in-module "Pango")
   (c-name "PangoTabArray")
@@ -171,8 +111,106 @@
 )
 
 
+; object definitions ...
+
+(define-object Context
+  (in-module "Pango")
+  (parent "GObject")
+  (c-name "PangoContext")
+  (gtype-id "PANGO_TYPE_CONTEXT")
+)
+
+(define-object Engine
+  (in-module "Pango")
+  (parent "GObject")
+  (c-name "PangoEngine")
+  (gtype-id "PANGO_TYPE_ENGINE")
+)
+
+(define-object EngineLang
+  (in-module "Pango")
+  (parent "PangoEngine")
+  (c-name "PangoEngineLang")
+  (gtype-id "PANGO_TYPE_ENGINE_LANG")
+)
+
+(define-object EngineShape
+  (in-module "Pango")
+  (parent "PangoEngine")
+  (c-name "PangoEngineShape")
+  (gtype-id "PANGO_TYPE_ENGINE_SHAPE")
+)
+
+(define-object Font
+  (in-module "Pango")
+  (parent "GObject")
+  (c-name "PangoFont")
+  (gtype-id "PANGO_TYPE_FONT")
+)
+
+(define-object FontFace
+  (in-module "Pango")
+  (parent "GObject")
+  (c-name "PangoFontFace")
+  (gtype-id "PANGO_TYPE_FONT_FACE")
+)
+
+(define-object FontFamily
+  (in-module "Pango")
+  (parent "GObject")
+  (c-name "PangoFontFamily")
+  (gtype-id "PANGO_TYPE_FONT_FAMILY")
+)
+
+(define-object FontMap
+  (in-module "Pango")
+  (parent "GObject")
+  (c-name "PangoFontMap")
+  (gtype-id "PANGO_TYPE_FONT_MAP")
+)
+
+(define-object Fontset
+  (in-module "Pango")
+  (parent "GObject")
+  (c-name "PangoFontset")
+  (gtype-id "PANGO_TYPE_FONTSET")
+)
+
+(define-object FontsetSimple
+  (in-module "Pango")
+  (parent "PangoFontset")
+  (c-name "PangoFontsetSimple")
+  (gtype-id "PANGO_TYPE_FONTSET_SIMPLE")
+)
+
+(define-object Layout
+  (in-module "Pango")
+  (parent "GObject")
+  (c-name "PangoLayout")
+  (gtype-id "PANGO_TYPE_LAYOUT")
+)
+
+(define-object Renderer
+  (in-module "Pango")
+  (parent "GObject")
+  (c-name "PangoRenderer")
+  (gtype-id "PANGO_TYPE_RENDERER")
+)
+
+
 ;; Enumerations and flags ...
 
+(define-enum Alignment
+  (in-module "Pango")
+  (c-name "PangoAlignment")
+  (gtype-id "PANGO_TYPE_ALIGNMENT")
+  (values
+    '("left" "PANGO_ALIGN_LEFT")
+    '("center" "PANGO_ALIGN_CENTER")
+    '("right" "PANGO_ALIGN_RIGHT")
+  )
+)
+
 (define-enum AttrType
   (in-module "Pango")
   (c-name "PangoAttrType")
@@ -194,18 +232,11 @@
     '("rise" "PANGO_ATTR_RISE")
     '("shape" "PANGO_ATTR_SHAPE")
     '("scale" "PANGO_ATTR_SCALE")
-  )
-)
-
-(define-enum Underline
-  (in-module "Pango")
-  (c-name "PangoUnderline")
-  (gtype-id "PANGO_TYPE_UNDERLINE")
-  (values
-    '("none" "PANGO_UNDERLINE_NONE")
-    '("single" "PANGO_UNDERLINE_SINGLE")
-    '("double" "PANGO_UNDERLINE_DOUBLE")
-    '("low" "PANGO_UNDERLINE_LOW")
+    '("fallback" "PANGO_ATTR_FALLBACK")
+    '("letter-spacing" "PANGO_ATTR_LETTER_SPACING")
+    '("underline-color" "PANGO_ATTR_UNDERLINE_COLOR")
+    '("strikethrough-color" "PANGO_ATTR_STRIKETHROUGH_COLOR")
+    '("absolute-size" "PANGO_ATTR_ABSOLUTE_SIZE")
   )
 )
 
@@ -221,38 +252,112 @@
   )
 )
 
-(define-enum Style
+(define-enum Direction
   (in-module "Pango")
-  (c-name "PangoStyle")
-  (gtype-id "PANGO_TYPE_STYLE")
+  (c-name "PangoDirection")
+  (gtype-id "PANGO_TYPE_DIRECTION")
   (values
-    '("normal" "PANGO_STYLE_NORMAL")
-    '("oblique" "PANGO_STYLE_OBLIQUE")
-    '("italic" "PANGO_STYLE_ITALIC")
+    '("ltr" "PANGO_DIRECTION_LTR")
+    '("rtl" "PANGO_DIRECTION_RTL")
+    '("ttb-ltr" "PANGO_DIRECTION_TTB_LTR")
+    '("ttb-rtl" "PANGO_DIRECTION_TTB_RTL")
+    '("weak-ltr" "PANGO_DIRECTION_WEAK_LTR")
+    '("weak-rtl" "PANGO_DIRECTION_WEAK_RTL")
+    '("neutral" "PANGO_DIRECTION_NEUTRAL")
   )
 )
 
-(define-enum Variant
+(define-enum EllipsizeMode
   (in-module "Pango")
-  (c-name "PangoVariant")
-  (gtype-id "PANGO_TYPE_VARIANT")
+  (c-name "PangoEllipsizeMode")
+  (gtype-id "PANGO_TYPE_ELLIPSIZE_MODE")
   (values
-    '("normal" "PANGO_VARIANT_NORMAL")
-    '("small-caps" "PANGO_VARIANT_SMALL_CAPS")
+    '("none" "PANGO_ELLIPSIZE_NONE")
+    '("start" "PANGO_ELLIPSIZE_START")
+    '("middle" "PANGO_ELLIPSIZE_MIDDLE")
+    '("end" "PANGO_ELLIPSIZE_END")
   )
 )
 
-(define-enum Weight
+(define-enum RenderPart
   (in-module "Pango")
-  (c-name "PangoWeight")
-  (gtype-id "PANGO_TYPE_WEIGHT")
+  (c-name "PangoRenderPart")
+  (gtype-id "PANGO_TYPE_RENDER_PART")
   (values
-    '("ultralight" "PANGO_WEIGHT_ULTRALIGHT")
-    '("light" "PANGO_WEIGHT_LIGHT")
-    '("normal" "PANGO_WEIGHT_NORMAL")
-    '("bold" "PANGO_WEIGHT_BOLD")
-    '("ultrabold" "PANGO_WEIGHT_ULTRABOLD")
-    '("heavy" "PANGO_WEIGHT_HEAVY")
+    '("foreground" "PANGO_RENDER_PART_FOREGROUND")
+    '("background" "PANGO_RENDER_PART_BACKGROUND")
+    '("underline" "PANGO_RENDER_PART_UNDERLINE")
+    '("strikethrough" "PANGO_RENDER_PART_STRIKETHROUGH")
+  )
+)
+
+(define-enum Script
+  (in-module "Pango")
+  (c-name "PangoScript")
+  (gtype-id "PANGO_TYPE_SCRIPT")
+  (values
+    '("invalid-code" "PANGO_SCRIPT_INVALID_CODE")
+    '("common" "PANGO_SCRIPT_COMMON")
+    '("inherited" "PANGO_SCRIPT_INHERITED")
+    '("arabic" "PANGO_SCRIPT_ARABIC")
+    '("armenian" "PANGO_SCRIPT_ARMENIAN")
+    '("bengali" "PANGO_SCRIPT_BENGALI")
+    '("bopomofo" "PANGO_SCRIPT_BOPOMOFO")
+    '("cherokee" "PANGO_SCRIPT_CHEROKEE")
+    '("coptic" "PANGO_SCRIPT_COPTIC")
+    '("cyrillic" "PANGO_SCRIPT_CYRILLIC")
+    '("deseret" "PANGO_SCRIPT_DESERET")
+    '("devanagari" "PANGO_SCRIPT_DEVANAGARI")
+    '("ethiopic" "PANGO_SCRIPT_ETHIOPIC")
+    '("georgian" "PANGO_SCRIPT_GEORGIAN")
+    '("gothic" "PANGO_SCRIPT_GOTHIC")
+    '("greek" "PANGO_SCRIPT_GREEK")
+    '("gujarati" "PANGO_SCRIPT_GUJARATI")
+    '("gurmukhi" "PANGO_SCRIPT_GURMUKHI")
+    '("han" "PANGO_SCRIPT_HAN")
+    '("hangul" "PANGO_SCRIPT_HANGUL")
+    '("hebrew" "PANGO_SCRIPT_HEBREW")
+    '("hiragana" "PANGO_SCRIPT_HIRAGANA")
+    '("kannada" "PANGO_SCRIPT_KANNADA")
+    '("katakana" "PANGO_SCRIPT_KATAKANA")
+    '("khmer" "PANGO_SCRIPT_KHMER")
+    '("lao" "PANGO_SCRIPT_LAO")
+    '("latin" "PANGO_SCRIPT_LATIN")
+    '("malayalam" "PANGO_SCRIPT_MALAYALAM")
+    '("mongolian" "PANGO_SCRIPT_MONGOLIAN")
+    '("myanmar" "PANGO_SCRIPT_MYANMAR")
+    '("ogham" "PANGO_SCRIPT_OGHAM")
+    '("old-italic" "PANGO_SCRIPT_OLD_ITALIC")
+    '("oriya" "PANGO_SCRIPT_ORIYA")
+    '("runic" "PANGO_SCRIPT_RUNIC")
+    '("sinhala" "PANGO_SCRIPT_SINHALA")
+    '("syriac" "PANGO_SCRIPT_SYRIAC")
+    '("tamil" "PANGO_SCRIPT_TAMIL")
+    '("telugu" "PANGO_SCRIPT_TELUGU")
+    '("thaana" "PANGO_SCRIPT_THAANA")
+    '("thai" "PANGO_SCRIPT_THAI")
+    '("tibetan" "PANGO_SCRIPT_TIBETAN")
+    '("canadian-aboriginal" "PANGO_SCRIPT_CANADIAN_ABORIGINAL")
+    '("yi" "PANGO_SCRIPT_YI")
+    '("tagalog" "PANGO_SCRIPT_TAGALOG")
+    '("hanunoo" "PANGO_SCRIPT_HANUNOO")
+    '("buhid" "PANGO_SCRIPT_BUHID")
+    '("tagbanwa" "PANGO_SCRIPT_TAGBANWA")
+    '("braille" "PANGO_SCRIPT_BRAILLE")
+    '("cypriot" "PANGO_SCRIPT_CYPRIOT")
+    '("limbu" "PANGO_SCRIPT_LIMBU")
+    '("osmanya" "PANGO_SCRIPT_OSMANYA")
+    '("shavian" "PANGO_SCRIPT_SHAVIAN")
+    '("linear-b" "PANGO_SCRIPT_LINEAR_B")
+    '("tai-le" "PANGO_SCRIPT_TAI_LE")
+    '("ugaritic" "PANGO_SCRIPT_UGARITIC")
+    '("new-tai-lue" "PANGO_SCRIPT_NEW_TAI_LUE")
+    '("buginese" "PANGO_SCRIPT_BUGINESE")
+    '("glagolitic" "PANGO_SCRIPT_GLAGOLITIC")
+    '("tifinagh" "PANGO_SCRIPT_TIFINAGH")
+    '("syloti-nagri" "PANGO_SCRIPT_SYLOTI_NAGRI")
+    '("old-persian" "PANGO_SCRIPT_OLD_PERSIAN")
+    '("kharoshthi" "PANGO_SCRIPT_KHAROSHTHI")
   )
 )
 
@@ -273,83 +378,86 @@
   )
 )
 
-(define-flags FontMask
+(define-enum Style
   (in-module "Pango")
-  (c-name "PangoFontMask")
-  (gtype-id "PANGO_TYPE_FONT_MASK")
+  (c-name "PangoStyle")
+  (gtype-id "PANGO_TYPE_STYLE")
   (values
-    '("family" "PANGO_FONT_MASK_FAMILY")
-    '("style" "PANGO_FONT_MASK_STYLE")
-    '("variant" "PANGO_FONT_MASK_VARIANT")
-    '("weight" "PANGO_FONT_MASK_WEIGHT")
-    '("stretch" "PANGO_FONT_MASK_STRETCH")
-    '("size" "PANGO_FONT_MASK_SIZE")
+    '("normal" "PANGO_STYLE_NORMAL")
+    '("oblique" "PANGO_STYLE_OBLIQUE")
+    '("italic" "PANGO_STYLE_ITALIC")
   )
 )
 
-(define-enum Alignment
+(define-enum TabAlign
   (in-module "Pango")
-  (c-name "PangoAlignment")
-  (gtype-id "PANGO_TYPE_ALIGNMENT")
+  (c-name "PangoTabAlign")
+  (gtype-id "PANGO_TYPE_TAB_ALIGN")
   (values
-    '("left" "PANGO_ALIGN_LEFT")
-    '("center" "PANGO_ALIGN_CENTER")
-    '("right" "PANGO_ALIGN_RIGHT")
+    '("left" "PANGO_TAB_LEFT")
   )
 )
 
-(define-enum WrapMode
+(define-enum Underline
   (in-module "Pango")
-  (c-name "PangoWrapMode")
-  (gtype-id "PANGO_TYPE_WRAP_MODE")
+  (c-name "PangoUnderline")
+  (gtype-id "PANGO_TYPE_UNDERLINE")
   (values
-    '("word" "PANGO_WRAP_WORD")
-    '("char" "PANGO_WRAP_CHAR")
+    '("none" "PANGO_UNDERLINE_NONE")
+    '("single" "PANGO_UNDERLINE_SINGLE")
+    '("double" "PANGO_UNDERLINE_DOUBLE")
+    '("low" "PANGO_UNDERLINE_LOW")
+    '("error" "PANGO_UNDERLINE_ERROR")
   )
 )
 
-(define-enum TabAlign
+(define-enum Variant
   (in-module "Pango")
-  (c-name "PangoTabAlign")
-  (gtype-id "PANGO_TYPE_TAB_ALIGN")
+  (c-name "PangoVariant")
+  (gtype-id "PANGO_TYPE_VARIANT")
   (values
-    '("left" "PANGO_TAB_LEFT")
+    '("normal" "PANGO_VARIANT_NORMAL")
+    '("small-caps" "PANGO_VARIANT_SMALL_CAPS")
   )
 )
 
-(define-enum Direction
+(define-enum Weight
   (in-module "Pango")
-  (c-name "PangoDirection")
-  (gtype-id "PANGO_TYPE_DIRECTION")
+  (c-name "PangoWeight")
+  (gtype-id "PANGO_TYPE_WEIGHT")
   (values
-    '("ltr" "PANGO_DIRECTION_LTR")
-    '("rtl" "PANGO_DIRECTION_RTL")
-    '("ttb-ltr" "PANGO_DIRECTION_TTB_LTR")
-    '("ttb-rtl" "PANGO_DIRECTION_TTB_RTL")
+    '("ultralight" "PANGO_WEIGHT_ULTRALIGHT")
+    '("light" "PANGO_WEIGHT_LIGHT")
+    '("normal" "PANGO_WEIGHT_NORMAL")
+    '("semibold" "PANGO_WEIGHT_SEMIBOLD")
+    '("bold" "PANGO_WEIGHT_BOLD")
+    '("ultrabold" "PANGO_WEIGHT_ULTRABOLD")
+    '("heavy" "PANGO_WEIGHT_HEAVY")
   )
 )
 
-(define-enum EllipsizeMode
+(define-enum WrapMode
   (in-module "Pango")
-  (c-name "PangoEllipsizeMode")
-  (gtype-id "PANGO_TYPE_ELLIPSIZE_MODE")
+  (c-name "PangoWrapMode")
+  (gtype-id "PANGO_TYPE_WRAP_MODE")
   (values
-    '("none" "PANGO_ELLIPSIZE_NONE")
-    '("start" "PANGO_ELLIPSIZE_START")
-    '("middle" "PANGO_ELLIPSIZE_MIDDLE")
-    '("end" "PANGO_ELLIPSIZE_END")
+    '("word" "PANGO_WRAP_WORD")
+    '("char" "PANGO_WRAP_CHAR")
+    '("word-char" "PANGO_WRAP_WORD_CHAR")
   )
 )
 
-(define-enum RenderPart
+(define-flags FontMask
   (in-module "Pango")
-  (c-name "PangoRenderPart")
-  (gtype-id "PANGO_TYPE_RENDER_PART")
+  (c-name "PangoFontMask")
+  (gtype-id "PANGO_TYPE_FONT_MASK")
   (values
-    '("foreground" "PANGO_RENDER_PART_FOREGROUND")
-    '("background" "PANGO_RENDER_PART_BACKGROUND")
-    '("underline" "PANGO_RENDER_PART_UNDERLINE")
-    '("strikethrough" "PANGO_RENDER_PART_STRIKETHROUGH")
+    '("family" "PANGO_FONT_MASK_FAMILY")
+    '("style" "PANGO_FONT_MASK_STYLE")
+    '("variant" "PANGO_FONT_MASK_VARIANT")
+    '("weight" "PANGO_FONT_MASK_WEIGHT")
+    '("stretch" "PANGO_FONT_MASK_STRETCH")
+    '("size" "PANGO_FONT_MASK_SIZE")
   )
 )