pango: Update to 1.49.0+54e1aed0

2 files changed, 85 insertions, 81 deletions

diff --git a/vapi/metadata/Pango-1.0.metadata b/vapi/metadata/Pango-1.0.metadata
index 3489f74c4..d25c9a2c9 100644
--- a/vapi/metadata/Pango-1.0.metadata
+++ b/vapi/metadata/Pango-1.0.metadata
@@ -22,8 +22,6 @@ AttrDataCopyFunc skip
 // Fields
 AttrColor
   .color unowned=false
-EngineInfo
-  .scripts array unowned=false array_length_field="n_scripts"
 GlyphString
   .glyphs unowned=false array_length_field="num_glyphs"
   .log_clusters array unowned=false array_length_field="num_glyphs"
@@ -41,17 +39,12 @@ Attribute
 Coverage
   .copy skip=false
 Font
-  .find_shaper skip=false
   .get_coverage skip=false
 
 // Variadic
 TabArray
   .new_with_positions skip=false
 
-// Contains only function pointers without typedefs
-IncludedModule skip
-module_register skip
-
 read_line
   .stream type="GLib.FileStream"
 
diff --git a/vapi/pango.vapi b/vapi/pango.vapi
index 2d9b286f2..edc2baa1b 100644
--- a/vapi/pango.vapi
+++ b/vapi/pango.vapi
@@ -67,7 +67,7 @@ namespace Pango {
 		public unowned Pango.Attribute? @get (Pango.AttrType type);
 		[Version (since = "1.2")]
 		public GLib.SList<Pango.Attribute> get_attrs ();
-		public void get_font (Pango.FontDescription desc, out unowned Pango.Language? language, owned GLib.SList<Pango.Attribute>? extra_attrs);
+		public void get_font (Pango.FontDescription desc, out Pango.Language language, out GLib.SList<Pango.Attribute> extra_attrs);
 		public bool next ();
 		public void range (out int start, out int end);
 	}
@@ -144,6 +144,23 @@ namespace Pango {
 		public uint end_index;
 		public weak Pango.AttrClass klass;
 		public uint start_index;
+		[Version (since = "1.50")]
+		public unowned Pango.AttrColor? as_color ();
+		[Version (since = "1.50")]
+		public unowned Pango.AttrFloat? as_float ();
+		[Version (since = "1.50")]
+		public unowned Pango.AttrFontDesc? as_font_desc ();
+		[Version (since = "1.50")]
+		public unowned Pango.AttrFontFeatures? as_font_features ();
+		[Version (since = "1.50")]
+		public unowned Pango.AttrInt? as_int ();
+		[Version (since = "1.50")]
+		public unowned Pango.AttrLanguage? as_language ();
+		[Version (since = "1.50")]
+		public unowned Pango.AttrShape? as_shape ();
+		[Version (since = "1.50")]
+		public unowned Pango.AttrSize? as_size ();
+		public unowned Pango.AttrString? as_string ();
 		public Pango.Attribute copy ();
 		[DestroysInstance]
 		public void destroy ();
@@ -207,30 +224,6 @@ namespace Pango {
 		public void to_bytes ([CCode (array_length_cname = "n_bytes", array_length_pos = 1.1)] out uint8[] bytes);
 		public void unref ();
 	}
-	[CCode (cheader_filename = "pango/pango.h", type_id = "pango_engine_get_type ()")]
-	[Version (deprecated = true, deprecated_since = "1.38")]
-	public abstract class Engine : GLib.Object {
-		[CCode (has_construct_function = false)]
-		protected Engine ();
-	}
-	[CCode (cheader_filename = "pango/pango.h", type_id = "pango_engine_lang_get_type ()")]
-	[Version (deprecated = true, deprecated_since = "1.38")]
-	public abstract class EngineLang : Pango.Engine {
-		[CCode (has_construct_function = false)]
-		protected EngineLang ();
-		[NoWrapper]
-		public virtual void script_break (string text, int len, Pango.Analysis analysis, Pango.LogAttr attrs, int attrs_len);
-	}
-	[CCode (cheader_filename = "pango/pango.h", type_id = "pango_engine_shape_get_type ()")]
-	[Version (deprecated = true, deprecated_since = "1.38")]
-	public abstract class EngineShape : Pango.Engine {
-		[CCode (has_construct_function = false)]
-		protected EngineShape ();
-		[NoWrapper]
-		public virtual Pango.CoverageLevel covers (Pango.Font font, Pango.Language language, unichar wc);
-		[NoWrapper]
-		public virtual void script_shape (Pango.Font font, string item_text, uint item_length, Pango.Analysis analysis, Pango.GlyphString glyphs, string paragraph_text, uint paragraph_length);
-	}
 	[CCode (cheader_filename = "pango/pango.h", type_id = "pango_font_get_type ()")]
 	public abstract class Font : GLib.Object {
 		[CCode (has_construct_function = false)]
@@ -243,8 +236,6 @@ namespace Pango {
 		[Version (since = "1.14")]
 		public Pango.FontDescription describe_with_absolute_size ();
 		public static void descriptions_free ([CCode (array_length_cname = "n_descs", array_length_pos = 1.1)] owned Pango.FontDescription[]? descs);
-		[Version (deprecated = true)]
-		public unowned Pango.EngineShape find_shaper (Pango.Language language, uint32 ch);
 		public virtual Pango.Coverage get_coverage (Pango.Language language);
 		[Version (since = "1.46")]
 		public unowned Pango.FontFace get_face ();
@@ -253,6 +244,8 @@ namespace Pango {
 		[Version (since = "1.10")]
 		public virtual unowned Pango.FontMap? get_font_map ();
 		public virtual void get_glyph_extents (Pango.Glyph glyph, out Pango.Rectangle ink_rect, out Pango.Rectangle logical_rect);
+		[Version (since = "1.50")]
+		public unowned Pango.Language? get_languages ();
 		public virtual Pango.FontMetrics get_metrics (Pango.Language? language);
 		[Version (since = "1.44")]
 		public bool has_char (unichar wc);
@@ -467,6 +460,8 @@ namespace Pango {
 		public bool get_auto_dir ();
 		[Version (since = "1.22")]
 		public int get_baseline ();
+		[Version (since = "1.50")]
+		public void get_caret_pos (int index_, out Pango.Rectangle strong_pos, out Pango.Rectangle weak_pos);
 		[Version (since = "1.30")]
 		public int get_character_count ();
 		public unowned Pango.Context get_context ();
@@ -483,6 +478,8 @@ namespace Pango {
 		public int get_indent ();
 		public Pango.LayoutIter get_iter ();
 		public bool get_justify ();
+		[Version (since = "1.50")]
+		public bool get_justify_last_line ();
 		public unowned Pango.LayoutLine? get_line (int line);
 		public int get_line_count ();
 		[Version (since = "1.16")]
@@ -527,6 +524,8 @@ namespace Pango {
 		public void set_height (int height);
 		public void set_indent (int indent);
 		public void set_justify (bool justify);
+		[Version (since = "1.50")]
+		public void set_justify_last_line (bool justify);
 		[Version (since = "1.44")]
 		public void set_line_spacing (float factor);
 		public void set_markup (string markup, int length);
@@ -570,7 +569,6 @@ namespace Pango {
 	[CCode (cheader_filename = "pango/pango.h", ref_function = "pango_layout_line_ref", type_id = "pango_layout_line_get_type ()", unref_function = "pango_layout_line_unref")]
 	[Compact]
 	public class LayoutLine {
-		public uint is_paragraph_start;
 		public weak Pango.Layout layout;
 		public int length;
 		public uint resolved_dir;
@@ -579,9 +577,17 @@ namespace Pango {
 		public void get_extents (out Pango.Rectangle ink_rect, out Pango.Rectangle logical_rect);
 		[Version (since = "1.44")]
 		public void get_height (out int height);
+		[Version (since = "1.50")]
+		public int get_length ();
 		public void get_pixel_extents (out Pango.Rectangle ink_rect, out Pango.Rectangle logical_rect);
+		[Version (since = "1.50")]
+		public Pango.Direction get_resolved_direction ();
+		[Version (since = "1.50")]
+		public int get_start_index ();
 		public void get_x_ranges (int start_index, int end_index, [CCode (array_length_cname = "n_ranges", array_length_pos = 3.1)] out int[] ranges);
 		public void index_to_x (int index_, bool trailing, out int x_pos);
+		[Version (since = "1.50")]
+		public bool is_paragraph_start ();
 		[Version (since = "1.10")]
 		public unowned Pango.LayoutLine @ref ();
 		public void unref ();
@@ -591,14 +597,6 @@ namespace Pango {
 	[Compact]
 	public class LayoutRun : Pango.GlyphItem {
 	}
-	[CCode (cheader_filename = "pango/pango.h", has_type_id = false)]
-	[Compact]
-	public class Map {
-	}
-	[CCode (cheader_filename = "pango/pango.h", has_type_id = false)]
-	[Compact]
-	public class MapEntry {
-	}
 	[CCode (cheader_filename = "pango/pango.h", type_id = "pango_renderer_get_type ()")]
 	[Version (since = "1.8")]
 	public abstract class Renderer : GLib.Object {
@@ -668,8 +666,8 @@ namespace Pango {
 	}
 	[CCode (cheader_filename = "pango/pango.h", has_type_id = false)]
 	public struct Analysis {
-		public weak Pango.EngineShape shape_engine;
-		public weak Pango.EngineLang lang_engine;
+		public void* shape_engine;
+		public void* lang_engine;
 		public weak Pango.Font font;
 		public uint8 level;
 		public uint8 gravity;
@@ -691,22 +689,6 @@ namespace Pango {
 		[Version (since = "1.16")]
 		public string to_string ();
 	}
-	[CCode (cheader_filename = "pango/pango.h", has_type_id = false)]
-	[Version (deprecated = true, deprecated_since = "1.38")]
-	public struct EngineInfo {
-		public weak string id;
-		public weak string engine_type;
-		public weak string render_type;
-		[CCode (array_length_cname = "n_scripts")]
-		public Pango.EngineScriptInfo[] scripts;
-		public int n_scripts;
-	}
-	[CCode (cheader_filename = "pango/pango.h", has_type_id = false)]
-	[Version (deprecated = true, deprecated_since = "1.38")]
-	public struct EngineScriptInfo {
-		public Pango.Script script;
-		public weak string langs;
-	}
 	[CCode (cheader_filename = "pango/pango.h")]
 	[SimpleType]
 	public struct Glyph : uint32 {
@@ -764,6 +746,8 @@ namespace Pango {
 		public uint backspace_deletes_character;
 		public uint is_expandable_space;
 		public uint is_word_boundary;
+		public uint break_inserts_hyphen;
+		public uint break_removes_preceding;
 	}
 	[CCode (cheader_filename = "pango/pango.h", copy_function = "g_boxed_copy", free_function = "g_boxed_free", type_id = "pango_matrix_get_type ()")]
 	[Version (since = "1.6")]
@@ -786,11 +770,11 @@ namespace Pango {
 		[Version (since = "1.16")]
 		public void transform_distance (ref double dx, ref double dy);
 		[Version (since = "1.16")]
-		public void transform_pixel_rectangle (ref Pango.Rectangle? rect);
+		public void transform_pixel_rectangle (ref Pango.Rectangle rect);
 		[Version (since = "1.16")]
 		public void transform_point (ref double x, ref double y);
 		[Version (since = "1.16")]
-		public void transform_rectangle (ref Pango.Rectangle? rect);
+		public void transform_rectangle (ref Pango.Rectangle rect);
 		public void translate (double tx, double ty);
 	}
 	[CCode (cheader_filename = "pango/pango.h", has_type_id = false)]
@@ -838,7 +822,12 @@ namespace Pango {
 		SHOW,
 		INSERT_HYPHENS,
 		OVERLINE,
-		OVERLINE_COLOR;
+		OVERLINE_COLOR,
+		LINE_HEIGHT,
+		ABSOLUTE_LINE_HEIGHT,
+		TEXT_TRANSFORM,
+		WORD,
+		SENTENCE;
 		[Version (since = "1.22")]
 		public unowned string? get_name ();
 		public static Pango.AttrType register (string name);
@@ -864,7 +853,11 @@ namespace Pango {
 		B,
 		S,
 		WS,
-		ON;
+		ON,
+		LRI,
+		RLI,
+		FSI,
+		PDI;
 		public static Pango.BidiType for_unichar (unichar ch);
 	}
 	[CCode (cheader_filename = "pango/pango.h", cprefix = "PANGO_COVERAGE_", type_id = "pango_coverage_level_get_type ()")]
@@ -1072,6 +1065,7 @@ namespace Pango {
 	}
 	[CCode (cheader_filename = "pango/pango.h", cprefix = "PANGO_SHOW_", type_id = "pango_show_flags_get_type ()")]
 	[Flags]
+	[Version (since = "1.44")]
 	public enum ShowFlags {
 		NONE,
 		SPACES,
@@ -1100,6 +1094,14 @@ namespace Pango {
 	public enum TabAlign {
 		LEFT
 	}
+	[CCode (cheader_filename = "pango/pango.h", cprefix = "PANGO_TEXT_TRANSFORM_", type_id = "pango_text_transform_get_type ()")]
+	[Version (since = "1.50")]
+	public enum TextTransform {
+		NONE,
+		LOWERCASE,
+		UPPERCASE,
+		CAPITALIZE
+	}
 	[CCode (cheader_filename = "pango/pango.h", cprefix = "PANGO_UNDERLINE_", type_id = "pango_underline_get_type ()")]
 	public enum Underline {
 		NONE,
@@ -1159,12 +1161,6 @@ namespace Pango {
 	[CCode (cheader_filename = "pango/pango.h", cname = "PANGO_ATTR_INDEX_TO_TEXT_END")]
 	[Version (since = "1.24")]
 	public const uint ATTR_INDEX_TO_TEXT_END;
-	[CCode (cheader_filename = "pango/pango.h", cname = "PANGO_ENGINE_TYPE_LANG")]
-	[Version (deprecated = true, deprecated_since = "1.38")]
-	public const string ENGINE_TYPE_LANG;
-	[CCode (cheader_filename = "pango/pango.h", cname = "PANGO_ENGINE_TYPE_SHAPE")]
-	[Version (deprecated = true, deprecated_since = "1.38")]
-	public const string ENGINE_TYPE_SHAPE;
 	[CCode (cheader_filename = "pango/pango.h", cname = "PANGO_GLYPH_EMPTY")]
 	public const Pango.Glyph GLYPH_EMPTY;
 	[CCode (cheader_filename = "pango/pango.h", cname = "PANGO_GLYPH_INVALID_INPUT")]
@@ -1172,15 +1168,8 @@ namespace Pango {
 	public const Pango.Glyph GLYPH_INVALID_INPUT;
 	[CCode (cheader_filename = "pango/pango.h", cname = "PANGO_GLYPH_UNKNOWN_FLAG")]
 	public const Pango.Glyph GLYPH_UNKNOWN_FLAG;
-	[CCode (cheader_filename = "pango/pango.h", cname = "PANGO_RENDER_TYPE_NONE")]
-	[Version (deprecated = true, deprecated_since = "1.38")]
-	public const string RENDER_TYPE_NONE;
 	[CCode (cheader_filename = "pango/pango.h", cname = "PANGO_SCALE")]
 	public const int SCALE;
-	[CCode (cheader_filename = "pango/pango.h", cname = "PANGO_UNKNOWN_GLYPH_HEIGHT")]
-	public const int UNKNOWN_GLYPH_HEIGHT;
-	[CCode (cheader_filename = "pango/pango.h", cname = "PANGO_UNKNOWN_GLYPH_WIDTH")]
-	public const int UNKNOWN_GLYPH_WIDTH;
 	[CCode (cheader_filename = "pango/pango.h", cname = "PANGO_VERSION_MAJOR")]
 	public const int VERSION_MAJOR;
 	[CCode (cheader_filename = "pango/pango.h", cname = "PANGO_VERSION_MICRO")]
@@ -1198,6 +1187,9 @@ namespace Pango {
 	[CCode (cheader_filename = "pango/pango.h")]
 	public static Pango.Attribute attr_background_new (uint16 red, uint16 green, uint16 blue);
 	[CCode (cheader_filename = "pango/pango.h")]
+	[Version (since = "1.50")]
+	public static void attr_break (string text, int length, Pango.AttrList attr_list, int offset, [CCode (array_length_cname = "attrs_len", array_length_pos = 5.1)] Pango.LogAttr[] attrs);
+	[CCode (cheader_filename = "pango/pango.h")]
 	[Version (since = "1.4")]
 	public static Pango.Attribute attr_fallback_new (bool enable_fallback);
 	[CCode (cheader_filename = "pango/pango.h")]
@@ -1223,6 +1215,12 @@ namespace Pango {
 	[Version (since = "1.6")]
 	public static Pango.Attribute attr_letter_spacing_new (int letter_spacing);
 	[CCode (cheader_filename = "pango/pango.h")]
+	[Version (since = "1.50")]
+	public static Pango.Attribute attr_line_height_new (double factor);
+	[CCode (cheader_filename = "pango/pango.h")]
+	[Version (since = "1.50")]
+	public static Pango.Attribute attr_line_height_new_absolute (int height);
+	[CCode (cheader_filename = "pango/pango.h")]
 	[Version (since = "1.46")]
 	public static Pango.Attribute attr_overline_color_new (uint16 red, uint16 green, uint16 blue);
 	[CCode (cheader_filename = "pango/pango.h")]
@@ -1233,6 +1231,9 @@ namespace Pango {
 	[CCode (cheader_filename = "pango/pango.h")]
 	public static Pango.Attribute attr_scale_new (double scale_factor);
 	[CCode (cheader_filename = "pango/pango.h")]
+	[Version (since = "1.50")]
+	public static Pango.Attribute attr_sentence_new ();
+	[CCode (cheader_filename = "pango/pango.h")]
 	[Version (since = "1.44")]
 	public static Pango.Attribute attr_show_new (Pango.ShowFlags flags);
 	[CCode (cheader_filename = "pango/pango.h")]
@@ -1245,6 +1246,9 @@ namespace Pango {
 	[CCode (cheader_filename = "pango/pango.h")]
 	public static Pango.Attribute attr_style_new (Pango.Style style);
 	[CCode (cheader_filename = "pango/pango.h")]
+	[Version (since = "1.50")]
+	public static Pango.Attribute attr_text_transform_new (Pango.TextTransform transform);
+	[CCode (cheader_filename = "pango/pango.h")]
 	[Version (replacement = "AttrType.get_name", since = "1.22")]
 	public static unowned string? attr_type_get_name (Pango.AttrType type);
 	[CCode (cheader_filename = "pango/pango.h")]
@@ -1260,6 +1264,9 @@ namespace Pango {
 	[CCode (cheader_filename = "pango/pango.h")]
 	public static Pango.Attribute attr_weight_new (Pango.Weight weight);
 	[CCode (cheader_filename = "pango/pango.h")]
+	[Version (since = "1.50")]
+	public static Pango.Attribute attr_word_new ();
+	[CCode (cheader_filename = "pango/pango.h")]
 	[Version (replacement = "BidiType.for_unichar", since = "1.22")]
 	public static Pango.BidiType bidi_type_for_unichar (unichar ch);
 	[CCode (cheader_filename = "pango/pango.h")]
@@ -1279,8 +1286,9 @@ namespace Pango {
 	[Version (replacement = "FontDescription.from_string")]
 	public static Pango.FontDescription font_description_from_string (string str);
 	[CCode (cheader_filename = "pango/pango.h")]
-	public static void get_log_attrs (string text, int length, int level, Pango.Language language, [CCode (array_length_cname = "attrs_len", array_length_pos = 5.1)] Pango.LogAttr[] log_attrs);
+	public static void get_log_attrs (string text, int length, int level, Pango.Language language, [CCode (array_length_cname = "attrs_len", array_length_pos = 5.1)] Pango.LogAttr[] attrs);
 	[CCode (cheader_filename = "pango/pango.h")]
+	[Version (deprecated = true, deprecated_since = "1.30")]
 	public static bool get_mirror_char (unichar ch, unichar mirrored_ch);
 	[CCode (cheader_filename = "pango/pango.h")]
 	[Version (replacement = "Gravity.get_for_matrix", since = "1.16")]
@@ -1340,7 +1348,7 @@ namespace Pango {
 	[Version (deprecated = true, deprecated_since = "1.38")]
 	public static int read_line ([CCode (type = "FILE*")] GLib.FileStream stream, GLib.StringBuilder str);
 	[CCode (cheader_filename = "pango/pango.h")]
-	public static GLib.List<Pango.Item> reorder_items (GLib.List<Pango.Item> logical_items);
+	public static GLib.List<Pango.Item> reorder_items (GLib.List<Pango.Item> items);
 	[CCode (cheader_filename = "pango/pango.h")]
 	[Version (deprecated = true, deprecated_since = "1.38")]
 	public static bool scan_int (ref string pos, out int @out);
@@ -1362,6 +1370,9 @@ namespace Pango {
 	[Version (since = "1.32")]
 	public static void shape_full (string item_text, int item_length, string? paragraph_text, int paragraph_length, Pango.Analysis analysis, Pango.GlyphString glyphs);
 	[CCode (cheader_filename = "pango/pango.h")]
+	[Version (since = "1.50")]
+	public static void shape_item (Pango.Item item, string? paragraph_text, int paragraph_length, Pango.LogAttr? log_attrs, Pango.GlyphString glyphs, Pango.ShapeFlags flags);
+	[CCode (cheader_filename = "pango/pango.h")]
 	[Version (since = "1.44")]
 	public static void shape_with_flags (string item_text, int item_length, string? paragraph_text, int paragraph_length, Pango.Analysis analysis, Pango.GlyphString glyphs, Pango.ShapeFlags flags);
 	[CCode (cheader_filename = "pango/pango.h")]
@@ -1372,7 +1383,7 @@ namespace Pango {
 	public static string[] split_file_list (string str);
 	[CCode (cheader_filename = "pango/pango.h")]
 	[Version (since = "1.44")]
-	public static void tailor_break (string text, int length, Pango.Analysis analysis, int offset, [CCode (array_length_cname = "log_attrs_len", array_length_pos = 5.1)] Pango.LogAttr[] log_attrs);
+	public static void tailor_break (string text, int length, Pango.Analysis analysis, int offset, [CCode (array_length_cname = "attrs_len", array_length_pos = 5.1)] Pango.LogAttr[] attrs);
 	[CCode (cheader_filename = "pango/pango.h")]
 	[Version (deprecated = true, deprecated_since = "1.38")]
 	public static string trim_string (string str);