pangomm r5 - in trunk: . docs/reference pango/src tools/extra_defs_gen
- From: murrayc svn gnome org
- To: svn-commits-list gnome org
- Subject: pangomm r5 - in trunk: . docs/reference pango/src tools/extra_defs_gen
- Date: Sun, 27 Jul 2008 10:11:07 +0000 (UTC)
Author: murrayc
Date: Sun Jul 27 10:11:07 2008
New Revision: 5
URL: http://svn.gnome.org/viewvc/pangomm?rev=5&view=rev
Log:
2008-07-27 Murray Cumming <murrayc murrayc com>
* pango/src/pango_docs.xml:
* pango/src/pango_enums.defs:
* pango/src/pango_methods.defs: Regenerated.
* pango/src/layout.hg: Added get_height(), set_height(),
get_baseline().
* pango/src/layoutiter.ccg:
* pango/src/layoutiter.hg: Added get_layout().
* pango/src/renderer.hg: Added get_layout() and get_layout_line().
Modified:
trunk/ChangeLog
trunk/docs/reference/Doxyfile.in
trunk/pango/src/layout.hg
trunk/pango/src/layoutiter.ccg
trunk/pango/src/layoutiter.hg
trunk/pango/src/pango_docs.xml
trunk/pango/src/pango_enums.defs
trunk/pango/src/pango_methods.defs
trunk/pango/src/renderer.hg
trunk/tools/extra_defs_gen/generate_defs_pango.cc
Modified: trunk/docs/reference/Doxyfile.in
==============================================================================
--- trunk/docs/reference/Doxyfile.in (original)
+++ trunk/docs/reference/Doxyfile.in Sun Jul 27 10:11:07 2008
@@ -39,7 +39,8 @@
"newin2p6=\xrefitem newin2p6s \"Since pangomm 2.6\" \"New API in pangomm 2.6\" \n" \
"newin2p8=\xrefitem newin2p8s \"Since pangomm 2.8\" \"New API in pangomm 2.8\" \n" \
"newin2p10=\xrefitem newin2p10s \"Since pangomm 2.10\" \"New API in pangomm 2.10\" \n" \
- "newin2p12=\xrefitem newin2p12s \"Since pangomm 2.12\" \"New API in pangomm 2.12\" \n"
+ "newin2p12=\xrefitem newin2p12s \"Since pangomm 2.12\" \"New API in pangomm 2.12\" \n" \
+ "newin2p12=\xrefitem newin2p12s \"Since pangomm 2.14\" \"New API in pangomm 2.14\" \n"
OPTIMIZE_OUTPUT_FOR_C = NO
OPTIMIZE_OUTPUT_JAVA = NO
BUILTIN_STL_SUPPORT = NO
Modified: trunk/pango/src/layout.hg
==============================================================================
--- trunk/pango/src/layout.hg (original)
+++ trunk/pango/src/layout.hg Sun Jul 27 10:11:07 2008
@@ -125,6 +125,8 @@
_WRAP_METHOD(void set_width(int width), pango_layout_set_width)
_WRAP_METHOD(int get_width() const, pango_layout_get_width)
+ _WRAP_METHOD(void set_height(int height), pango_layout_set_height)
+ _WRAP_METHOD(int get_height() const, pango_layout_get_height)
_WRAP_METHOD(void set_wrap(WrapMode wrap), pango_layout_set_wrap)
_WRAP_METHOD(WrapMode get_wrap() const, pango_layout_get_wrap)
_WRAP_METHOD(bool is_wrapped() const, pango_layout_is_wrapped)
@@ -219,6 +221,8 @@
_WRAP_METHOD(void get_size(int& width, int& height) const, pango_layout_get_size)
_WRAP_METHOD(void get_pixel_size(int& width, int& height) const, pango_layout_get_pixel_size)
+ _WRAP_METHOD(int get_baseline() const, pango_layout_get_baseline)
+
_WRAP_METHOD(int get_line_count() const, pango_layout_get_line_count)
//Note that the const version uses a different (faster) C function:
Modified: trunk/pango/src/layoutiter.ccg
==============================================================================
--- trunk/pango/src/layoutiter.ccg (original)
+++ trunk/pango/src/layoutiter.ccg Sun Jul 27 10:11:07 2008
@@ -20,6 +20,8 @@
* Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
*/
+#include <pangomm/layout.h>
+
namespace Pango
{
Modified: trunk/pango/src/layoutiter.hg
==============================================================================
--- trunk/pango/src/layoutiter.hg (original)
+++ trunk/pango/src/layoutiter.hg Sun Jul 27 10:11:07 2008
@@ -48,8 +48,12 @@
_WRAP_METHOD(Glib::RefPtr<LayoutLine> get_line() const, pango_layout_iter_get_line, refreturn)
//TODO: We should really have a const and non-const version: _WRAP_METHOD(Glib::RefPtr<const LayoutLine> get_line() const, pango_layout_iter_get_line_readonly, refreturn)
+
_WRAP_METHOD(bool at_last_line() const, pango_layout_iter_at_last_line)
+ _WRAP_METHOD(Glib::RefPtr<Layout> get_layout(), pango_layout_iter_get_layout, refreturn)
+ _WRAP_METHOD(Glib::RefPtr<const Layout> get_layout() const, pango_layout_iter_get_layout, refreturn, constversion)
+
_WRAP_METHOD(bool next_char(), pango_layout_iter_next_char)
_WRAP_METHOD(bool next_cluster(), pango_layout_iter_next_cluster)
_WRAP_METHOD(bool next_run(), pango_layout_iter_next_run)
Modified: trunk/pango/src/pango_docs.xml
==============================================================================
--- trunk/pango/src/pango_docs.xml (original)
+++ trunk/pango/src/pango_docs.xml Sun Jul 27 10:11:07 2008
@@ -55,20 +55,45 @@
<return></return>
</function>
-<function name="pango_layout_get_alignment">
+<function name="pango_renderer_get_layout_line">
<description>
-Gets the alignment for the layout: how partial lines are
-positioned within the horizontal space available.
+Gets the layout line currently being rendered using @renderer.
+Calling this function only makes sense from inside a subclass's
+methods, like in its draw_shape&lt;!----&gt;() for example.
+
+The returned layout line should not be modified while still being
+rendered.
</description>
<parameters>
-<parameter name="layout">
-<parameter_description> a #PangoLayout
+<parameter name="renderer">
+<parameter_description> a #PangoRenderer
</parameter_description>
</parameter>
</parameters>
-<return> the alignment.
+<return> the layout line, or %NULL if no layout line is being
+rendered using @renderer at this time.
+
+Since: 1.20
+</return>
+</function>
+
+<function name="pango_matrix_get_font_scale_factor">
+<description>
+Return value: the scale factor of @matrix on the height of the font,
+
+</description>
+<parameters>
+<parameter name="matrix">
+<parameter_description> a #PangoMatrix, may be %NULL
+</parameter_description>
+</parameter>
+</parameters>
+<return> the scale factor of @matrix on the height of the font,
+or 1.0 if @matrix is %NULL.
+
+Since: 1.12
</return>
</function>
@@ -189,12 +214,15 @@
</return>
</function>
-<function name="pango_layout_get_auto_dir">
+<function name="pango_layout_set_text">
<description>
-Gets whether to calculate the bidirectional base direction
-for the layout according to the contents of the layout.
-See pango_layout_set_auto_dir().
+Sets the text of the layout.
+Note that if you have used
+pango_layout_set_markup() or pango_layout_set_markup_with_accel() on
+ layout before, you may want to call pango_layout_set_attributes() to clear
+the attributes set on the layout from the markup as this function does not
+clear attributes.
</description>
<parameters>
@@ -202,50 +230,86 @@
<parameter_description> a #PangoLayout
</parameter_description>
</parameter>
+<parameter name="text">
+<parameter_description> a valid UTF-8 string
+</parameter_description>
+</parameter>
+<parameter name="length">
+<parameter_description> maximum length of @text, in bytes. -1 indicates that
+the string is nul-terminated and the length should be
+calculated. The text will also be truncated on
+encountering a nul-termination even when @length is
+positive.
+</parameter_description>
+</parameter>
</parameters>
-<return> %TRUE if the bidirectional base direction
-is computed from the layout's contents, %FALSE otherwise.
-
-Since: 1.4
-</return>
+<return></return>
</function>
-<function name="pango_ot_buffer_set_rtl">
+<function name="pango_parse_enum">
<description>
-Sets whether glyphs will be rendered right-to-left. This setting
-is needed for proper horizontal positioning of right-to-left scripts.
+Parses an enum type and stored the result in @value.
+
+If @str does not match the nick name of any of the possible values for the
+enum, %FALSE is returned, a warning is issued if @warn is %TRUE, and a
+string representing the list of possible values is stored in
+ possible_values The list is slash-separated, eg.
+"none/start/middle/end". If failed and @possible_values is not %NULL,
+returned string should be freed using g_free().
-Since: 1.4
</description>
<parameters>
-<parameter name="buffer">
-<parameter_description> a #PangoOTBuffer
+<parameter name="type">
+<parameter_description> enum type to parse, eg. %PANGO_TYPE_ELLIPSIZE_MODE.
</parameter_description>
</parameter>
-<parameter name="rtl">
-<parameter_description> %TRUE for right-to-left text
+<parameter name="str">
+<parameter_description> string to parse. May be %NULL.
+</parameter_description>
+</parameter>
+<parameter name="value">
+<parameter_description> integer to store the result in, or %NULL.
+</parameter_description>
+</parameter>
+<parameter name="warn">
+<parameter_description> if %TRUE, issue a g_warning() on bad input.
+</parameter_description>
+</parameter>
+<parameter name="possible_values">
+<parameter_description> place to store list of possible values on failure, or %NULL.
</parameter_description>
</parameter>
</parameters>
-<return></return>
+<return> %TRUE if @str was successfully parsed.
+
+Since: 1.16
+</return>
</function>
-<function name="_pango_glyph_item_iter_prev_cluster">
+<function name="pango_font_description_set_size">
<description>
-Moves the iterator to the preceding cluster in the glyph item.
-
+Sets the size field of a font description in fractional points. This is mutually
+exclusive with pango_font_description_set_absolute_size().
</description>
<parameters>
-<parameter name="iter">
-<parameter_description> a #PangoGlyphItemIter
+<parameter name="desc">
+<parameter_description> a #PangoFontDescription
+</parameter_description>
+</parameter>
+<parameter name="size">
+<parameter_description> the size of the font in points, scaled by PANGO_SCALE. (That is,
+a @size value of 10 * PANGO_SCALE is a 10 point font. The conversion
+factor between points and device units depends on system configuration
+and the output device. For screen display, a logical DPI of 96 is
+common, in which case a 10 point font corresponds to a 10 * (96 / 72) = 13.3
+pixel font. Use pango_font_description_set_absolute_size() if you need
+a particular size in device units.
</parameter_description>
</parameter>
</parameters>
-<return> %TRUE if the iterator was moved, %FALSE if we were already on the
-first cluster.
-</return>
+<return></return>
</function>
<function name="pango_fc_decoder_get_charset">
@@ -338,38 +402,30 @@
</return>
</function>
-<function name="pango_cairo_layout_path">
+<function name="pango_attr_language_new">
<description>
-Adds the text in a #PangoLayout to the current path in the
-specified cairo context. The top-left corner of the #PangoLayout
-will be at the current point of the cairo context.
+Create a new language tag attribute.
-Since: 1.10
</description>
<parameters>
-<parameter name="cr">
-<parameter_description> a Cairo context
-</parameter_description>
-</parameter>
-<parameter name="layout">
-<parameter_description> a Pango layout
+<parameter name="language">
+<parameter_description> language tag
</parameter_description>
</parameter>
</parameters>
-<return></return>
+<return> the newly allocated #PangoAttribute, which should be
+freed with pango_attribute_destroy().
+</return>
</function>
<function name="pango_layout_get_pixel_extents">
<description>
Computes the logical and ink extents of @layout in device units.
This function just calls pango_layout_get_extents() followed by
-pango_extents_to_pixels().
-
-See pango_extents_to_pixels() for details of how ink and logical rectangles
-are rounded to pixels. In certain situations you may want to use
-pango_layout_get_extents() directly and pass the resulting logical
-rectangle to pango_extents_to_pixels() as an ink rectangle().
+two pango_extents_to_pixels() calls, rounding @ink_rect and @logical_rect
+such that the rounded rectangles fully contain the unrounded one (that is,
+passes them as first argument to pango_extents_to_pixels()).
</description>
<parameters>
@@ -559,19 +615,22 @@
<return></return>
</function>
-<function name="pango_attr_type_register">
+<function name="pango_xft_font_get_unknown_glyph">
<description>
-Allocate a new attribute type ID.
-
+Return value: a glyph index into @font.
</description>
<parameters>
-<parameter name="name">
-<parameter_description> an identifier for the type (currently unused.)
+<parameter name="font">
+<parameter_description> a #PangoFont.
+</parameter_description>
+</parameter>
+<parameter name="wc">
+<parameter_description> the Unicode character for which a glyph is needed.
</parameter_description>
</parameter>
</parameters>
-<return> the new type ID.
+<return> a glyph index into @font.
</return>
</function>
@@ -618,24 +677,21 @@
</return>
</function>
-<function name="pango_tab_array_resize">
+<function name="pango_attribute_copy">
<description>
-Resizes a tab array. You must subsequently initialize any tabs that
-were added as a result of growing the array.
+Make a copy of an attribute.
</description>
<parameters>
-<parameter name="tab_array">
-<parameter_description> a #PangoTabArray
-</parameter_description>
-</parameter>
-<parameter name="new_size">
-<parameter_description> new size of the array
+<parameter name="attr">
+<parameter_description> a #PangoAttribute
</parameter_description>
</parameter>
</parameters>
-<return></return>
+<return> the newly allocated #PangoAttribute, which should be
+freed with pango_attribute_destroy().
+</return>
</function>
<function name="pango_atsui_font_get_atsu_font_id">
@@ -837,8 +893,7 @@
<function name="pango_layout_get_spacing">
<description>
-Gets the amount of spacing in #PangoGlyphUnit between the lines of the
-layout.
+Gets the amount of spacing between the lines of the layout.
</description>
@@ -848,7 +903,7 @@
</parameter_description>
</parameter>
</parameters>
-<return> the spacing.
+<return> the spacing in Pango units.
</return>
</function>
@@ -875,7 +930,7 @@
</description>
<parameters>
<parameter name="line">
-<parameter_description> a #PangoLayoutLine
+<parameter_description> a #PangoLayoutLine, may be %NULL
</parameter_description>
</parameter>
</parameters>
@@ -947,7 +1002,7 @@
</parameter_description>
</parameter>
</parameters>
-<return>the font loaded, or %NULL if no font matched.
+<return> the font loaded, or %NULL if no font matched.
</return>
</function>
@@ -961,7 +1016,7 @@
</description>
<parameters>
<parameter name="language">
-<parameter_description> a #PangoLanguage
+<parameter_description> a #PangoLanguage, or %NULL
</parameter_description>
</parameter>
</parameters>
@@ -996,6 +1051,29 @@
</return>
</function>
+<function name="pango_attr_type_get_name">
+<description>
+Fetches the attribute type name passed in when registering the type using
+pango_attr_type_register().
+
+The returned value is an interned string (see g_intern_string() for what
+that means) that should not be modified or freed.
+
+
+</description>
+<parameters>
+<parameter name="type">
+<parameter_description> an attribute type ID to fetch the name for
+</parameter_description>
+</parameter>
+</parameters>
+<return> the type ID name (which may be %NULL), or %NULL if @type is
+a built-in Pango attribute type or invalid.
+
+Since: 1.22
+</return>
+</function>
+
<function name="pango_units_to_double">
<description>
Converts a number in Pango units to floating-point: divides
@@ -1015,22 +1093,27 @@
</return>
</function>
-<function name="pango_layout_new">
+<function name="pango_x_font_cache_load">
<description>
-Create a new #PangoLayout object with attributes initialized to
-default values for a particular #PangoContext.
+Loads a #XFontStruct from a X Logical Font Description. The
+result may be newly loaded, or it may have been previously
+stored.
</description>
<parameters>
-<parameter name="context">
-<parameter_description> a #PangoContext
+<parameter name="cache">
+<parameter_description> a #PangoXFontCache
+</parameter_description>
+</parameter>
+<parameter name="xlfd">
+<parameter_description> the X Logical Font Description to load.
</parameter_description>
</parameter>
</parameters>
-<return> the newly allocated #PangoLayout, with a reference
-count of one, which should be freed with
-g_object_unref().
+<return> The font structure, or %NULL if the font could
+not be loaded. In order to free this structure, you must call
+pango_x_font_cache_unload().
</return>
</function>
@@ -1056,14 +1139,13 @@
<function name="pango_matrix_free">
<description>
Free a #PangoMatrix created with pango_matrix_copy().
-Does nothing if @matrix is %NULL.
Since: 1.6
</description>
<parameters>
<parameter name="matrix">
-<parameter_description> a #PangoMatrix, or %NULL
+<parameter_description> a #PangoMatrix, may be %NULL
</parameter_description>
</parameter>
</parameters>
@@ -1136,25 +1218,28 @@
<return></return>
</function>
-<function name="_pango_cairo_font_install">
+<function name="pango_ot_buffer_set_zero_width_marks">
<description>
-Makes @font the current font for rendering in the specified
-Cairo context.
+Sets whether characters with a mark class should be forced to zero width.
+This setting is needed for proper positioning of Arabic accents,
+but will produce incorrect results with standard OpenType Indic
+fonts.
+Since: 1.6
</description>
<parameters>
-<parameter name="font">
-<parameter_description> a #PangoCairoFont
+<parameter name="buffer">
+<parameter_description> a #PangoOTBuffer
</parameter_description>
</parameter>
-<parameter name="cr">
-<parameter_description> a #cairo_t
+<parameter name="zero_width_marks">
+<parameter_description> %TRUE if characters with a mark class should
+be forced to zero width.
</parameter_description>
</parameter>
</parameters>
-<return> %TRUE if font was installed successfully, %FALSE otherwise.
-</return>
+<return></return>
</function>
<function name="pango_layout_xy_to_index">
@@ -1176,12 +1261,12 @@
</parameter_description>
</parameter>
<parameter name="x">
-<parameter_description> the X offset (in #PangoGlyphUnit)
+<parameter_description> the X offset (in Pango units)
from the left edge of the layout.
</parameter_description>
</parameter>
<parameter name="y">
-<parameter_description> the Y offset (in #PangoGlyphUnit)
+<parameter_description> the Y offset (in Pango units)
from the top edge of the layout
</parameter_description>
</parameter>
@@ -1318,6 +1403,28 @@
<return></return>
</function>
+<function name="pango_attribute_init">
+<description>
+Initializes @attr's klass to @klass, it's start_index to zero,
+and end_index to %G_MAXUINT such that the attribute applies
+to the entire text by default.
+
+Since: 1.20
+
+</description>
+<parameters>
+<parameter name="attr">
+<parameter_description> a #PangoAttribute
+</parameter_description>
+</parameter>
+<parameter name="klass">
+<parameter_description> a #PangoAttributeClass
+</parameter_description>
+</parameter>
+</parameters>
+<return></return>
+</function>
+
<function name="pango_cairo_font_map_create_context">
<description>
Create a #PangoContext for the given fontmap.
@@ -1397,6 +1504,9 @@
from the extents rectangle to more traditional font metrics. The units
of the rectangles are in 1/PANGO_SCALE of a device unit.
+If @font is %NULL, this function gracefully sets some sane values in the
+output variables and returns.
+
</description>
<parameters>
<parameter name="font">
@@ -1566,7 +1676,7 @@
<function name="pango_ft2_font_get_face">
<description>
-Return value: a pointer to a &lt;type&gt;FT_Face&lt;/type&gt; structure, with the size set correctly
+Return value: a pointer to a &lt;type&gt;FT_Face&lt;/type&gt; structure, with the size set correctly,
</description>
<parameters>
@@ -1575,39 +1685,42 @@
</parameter_description>
</parameter>
</parameters>
-<return> a pointer to a &lt;type&gt;FT_Face&lt;/type&gt; structure, with the size set correctly
+<return> a pointer to a &lt;type&gt;FT_Face&lt;/type&gt; structure, with the size set correctly,
+or %NULL if @font is %NULL.
</return>
</function>
-<function name="pango_attr_background_new">
+<function name="pango_win32_font_description_from_logfont">
<description>
-Create a new background color attribute.
+Creates a #PangoFontDescription that matches the specified LOGFONTA.
+
+The face name, italicness and weight fields in the LOGFONTA are used
+to set up the resulting #PangoFontDescription. If the face name in
+the LOGFONTA contains non-ASCII characters the font is temporarily
+loaded (using CreateFontIndirect()) and an ASCII (usually English)
+name for it is looked up from the font name tables in the font
+data. If that doesn't work, the face name is converted from the
+system codepage to UTF-8 and that is used.
</description>
<parameters>
-<parameter name="red">
-<parameter_description> the red value (ranging from 0 to 65535)
-</parameter_description>
-</parameter>
-<parameter name="green">
-<parameter_description> the green value
-</parameter_description>
-</parameter>
-<parameter name="blue">
-<parameter_description> the blue value
+<parameter name="lfp">
+<parameter_description> a LOGFONTA
</parameter_description>
</parameter>
</parameters>
-<return> the newly allocated #PangoAttribute, which should be
-freed with pango_attribute_destroy().
+<return> the newly allocated #PangoFontDescription, which
+should be freed using pango_font_description_free()
+
+Since: 1.12
</return>
</function>
<function name="pango_coverage_unref">
<description>
-Increase the reference count on the #PangoCoverage by one.
-if the result is zero, free the coverage and all associated memory.
+Decrease the reference count on the #PangoCoverage by one.
+If the result is zero, free the coverage and all associated memory.
</description>
<parameters>
@@ -1639,29 +1752,28 @@
</return>
</function>
-<function name="pango_get_mirror_char">
+<function name="pango_attr_iterator_get">
<description>
-If @ch has the Unicode mirrored property and there is another Unicode
-character that typically has a glyph that is the mirror image of @ch's
-glyph, puts that character in the address pointed to by @mirrored_ch.
-
-Use g_unichar_get_mirror_char() instead; the docs for that function
-provide full details.
+Find the current attribute of a particular type at the iterator
+location. When multiple attributes of the same type overlap,
+the attribute whose range starts closest to the current location
+is used.
</description>
<parameters>
-<parameter name="ch">
-<parameter_description> a Unicode character
+<parameter name="iterator">
+<parameter_description> a #PangoAttrIterator
</parameter_description>
</parameter>
-<parameter name="mirrored_ch">
-<parameter_description> location to store the mirrored character
+<parameter name="type">
+<parameter_description> the type of attribute to find.
</parameter_description>
</parameter>
</parameters>
-<return> %TRUE if @ch has a mirrored character and @mirrored_ch is
-filled in, %FALSE otherwise
+<return> the current attribute of the given type, or %NULL
+if no attribute of that type applies to the current
+location.
</return>
</function>
@@ -1688,29 +1800,12 @@
</return>
</function>
-<function name="pango_context_set_language">
+<function name="pango_layout_get_auto_dir">
<description>
-Sets the global language tag for the context. The default language
-for the locale of the running process can be found using
-pango_language_get_default().
-
-</description>
-<parameters>
-<parameter name="context">
-<parameter_description> a #PangoContext
-</parameter_description>
-</parameter>
-<parameter name="language">
-<parameter_description> the new language tag.
-</parameter_description>
-</parameter>
-</parameters>
-<return></return>
-</function>
+Gets whether to calculate the bidirectional base direction
+for the layout according to the contents of the layout.
+See pango_layout_set_auto_dir().
-<function name="pango_layout_set_text">
-<description>
-Sets the text of the layout.
</description>
<parameters>
@@ -1718,20 +1813,12 @@
<parameter_description> a #PangoLayout
</parameter_description>
</parameter>
-<parameter name="text">
-<parameter_description> a valid UTF-8 string
-</parameter_description>
-</parameter>
-<parameter name="length">
-<parameter_description> maximum length of @text, in bytes. -1 indicates that
-the string is nul-terminated and the length should be
-calculated. The text will also be truncated on
-encountering a nul-termination even when @length is
-positive.
-</parameter_description>
-</parameter>
</parameters>
-<return></return>
+<return> %TRUE if the bidirectional base direction
+is computed from the layout's contents, %FALSE otherwise.
+
+Since: 1.4
+</return>
</function>
<function name="pango_attribute_equal">
@@ -1900,6 +1987,26 @@
<return></return>
</function>
+<function name="pango_layout_iter_copy">
+<description>
+Copies a #PangLayoutIter.
+
+
+</description>
+<parameters>
+<parameter name="iter">
+<parameter_description> a #PangoLayoutIter, may be %NULL
+</parameter_description>
+</parameter>
+</parameters>
+<return> the newly allocated #PangoLayoutIter, which should
+be freed with pango_layout_iter_free(), or %NULL if
+ iter was %NULL.
+
+Since: 1.20
+</return>
+</function>
+
<function name="pango_attr_gravity_new">
<description>
Create a new gravity attribute.
@@ -2012,84 +2119,61 @@
<return></return>
</function>
-<function name="pango_parse_enum">
+<function name="pango_ot_buffer_set_rtl">
<description>
-Parses an enum type and stored the result in @value.
-
-If @str does not match the nick name of any of the possible values for the
-enum, %FALSE is returned, a warning is issued if @warn is %TRUE, and a
-string representing the list of possible values is stored in
- possible_values The list is slash-separated, eg.
-"none/start/middle/end". If failed and @possible_values is not %NULL,
-returned string should be freed using g_free().
+Sets whether glyphs will be rendered right-to-left. This setting
+is needed for proper horizontal positioning of right-to-left scripts.
+Since: 1.4
</description>
<parameters>
-<parameter name="type">
-<parameter_description> enum type to parse, eg. %PANGO_TYPE_ELLIPSIZE_MODE.
-</parameter_description>
-</parameter>
-<parameter name="str">
-<parameter_description> string to parse. May be %NULL.
-</parameter_description>
-</parameter>
-<parameter name="value">
-<parameter_description> integer to store the result in, or %NULL.
-</parameter_description>
-</parameter>
-<parameter name="warn">
-<parameter_description> if %TRUE, issue a g_warning() on bad input.
+<parameter name="buffer">
+<parameter_description> a #PangoOTBuffer
</parameter_description>
</parameter>
-<parameter name="possible_values">
-<parameter_description> place to store list of possible values on failure, or %NULL.
+<parameter name="rtl">
+<parameter_description> %TRUE for right-to-left text
</parameter_description>
</parameter>
</parameters>
-<return> %TRUE if @str was successfully parsed.
-
-Since: 1.16
-</return>
+<return></return>
</function>
-<function name="pango_attribute_destroy">
+<function name="pango_version_string">
<description>
-Destroy a #PangoAttribute and free all associated memory.
+This is similar to the macro %PANGO_VERSION_STRING except that
+it returns the version of Pango available at run-time, as opposed to
+the version available at compile-time.
+
</description>
<parameters>
-<parameter name="attr">
-<parameter_description> a #PangoAttribute.
-</parameter_description>
-</parameter>
</parameters>
-<return></return>
+<return> A string containing the version of Pango library
+available at run time.
+The returned string is owned by Pango and should not be modified
+or freed.
+
+Since: 1.16
+</return>
</function>
-<function name="pango_font_description_set_size">
+<function name="_pango_glyph_item_iter_prev_cluster">
<description>
-Sets the size field of a font description in fractional points. This is mutually
-exclusive with pango_font_description_set_absolute_size().
+Moves the iterator to the preceding cluster in the glyph item.
+
</description>
<parameters>
-<parameter name="desc">
-<parameter_description> a #PangoFontDescription
-</parameter_description>
-</parameter>
-<parameter name="size">
-<parameter_description> the size of the font in points, scaled by PANGO_SCALE. (That is,
-a @size value of 10 * PANGO_SCALE is a 10 point font. The conversion
-factor between points and device units depends on system configuration
-and the output device. For screen display, a logical DPI of 96 is
-common, in which case a 10 point font corresponds to a 10 * (96 / 72) = 13.3
-pixel font. Use pango_font_description_set_absolute_size() if you need
-a particular size in device units.
+<parameter name="iter">
+<parameter_description> a #PangoGlyphItemIter
</parameter_description>
</parameter>
</parameters>
-<return></return>
+<return> %TRUE if the iterator was moved, %FALSE if we were already on the
+first cluster.
+</return>
</function>
<function name="pango_cairo_show_layout_line">
@@ -2327,7 +2411,8 @@
<function name="pango_layout_set_width">
<description>
-Sets the width to which the lines of the #PangoLayout should wrap.
+Sets the width to which the lines of the #PangoLayout should wrap or
+ellipsized. The default value is -1: no width set.
</description>
<parameters>
@@ -2337,28 +2422,33 @@
</parameter>
<parameter name="width">
<parameter_description> the desired width in Pango units, or -1 to indicate that no
-wrapping should be performed.
+wrapping or ellipsization should be performed.
</parameter_description>
</parameter>
</parameters>
<return></return>
</function>
-<function name="pango_attr_language_new">
+<function name="pango_cairo_layout_path">
<description>
-Create a new language tag attribute.
+Adds the text in a #PangoLayout to the current path in the
+specified cairo context. The top-left corner of the #PangoLayout
+will be at the current point of the cairo context.
+Since: 1.10
</description>
<parameters>
-<parameter name="language">
-<parameter_description> language tag
+<parameter name="cr">
+<parameter_description> a Cairo context
+</parameter_description>
+</parameter>
+<parameter name="layout">
+<parameter_description> a Pango layout
</parameter_description>
</parameter>
</parameters>
-<return> the newly allocated #PangoAttribute, which should be
-freed with pango_attribute_destroy().
-</return>
+<return></return>
</function>
<function name="pango_context_set_gravity_hint">
@@ -2385,25 +2475,25 @@
<return></return>
</function>
-<function name="pango_layout_set_indent">
+<function name="pango_layout_get_font_description">
<description>
-Sets the width in Pango units to indent each paragraph. A negative value
-of @indent will produce a hanging indentation. That is, the first line will
-have the full width, and subsequent lines will be indented by the
-absolute value of @indent.
+Gets the font description for the layout, if any.
+
</description>
<parameters>
<parameter name="layout">
-<parameter_description> a #PangoLayout.
-</parameter_description>
-</parameter>
-<parameter name="indent">
-<parameter_description> the amount by which to indent.
+<parameter_description> a #PangoLayout
</parameter_description>
</parameter>
</parameters>
-<return></return>
+<return> a pointer to the layout's font description,
+or %NULL if the font description from the layout's
+context is inherited. This value is owned by the layout
+and must not be modified or freed.
+
+Since: 1.8
+</return>
</function>
<function name="pango_parse_weight">
@@ -2554,7 +2644,7 @@
</description>
<parameters>
<parameter name="glyph_item">
-<parameter_description> a #PangoGlyphItem
+<parameter_description> a #PangoGlyphItem, may be %NULL
</parameter_description>
</parameter>
</parameters>
@@ -2677,10 +2767,9 @@
<function name="pango_layout_set_spacing">
<description>
-Sets the amount of spacing in #PangoGlyphUnit between the lines of the
+Sets the amount of spacing in Pango unit between the lines of the
layout.
-
</description>
<parameters>
<parameter name="layout">
@@ -2713,21 +2802,24 @@
</return>
</function>
-<function name="pango_attr_list_get_iterator">
+<function name="pango_ft2_get_unknown_glyph">
<description>
-Create a iterator initialized to the beginning of the list.
- list must not be modified until this iterator is freed.
+Return the index of a glyph suitable for drawing unknown characters with
+ font, or %PANGO_GLYPH_EMPTY if no suitable glyph found.
+
+If you want to draw an unknown-box for a character that is not covered
+by the font,
+use PANGO_GET_UNKNOWN_GLYPH() instead.
</description>
<parameters>
-<parameter name="list">
-<parameter_description> a #PangoAttrList
+<parameter name="font">
+<parameter_description> a #PangoFont
</parameter_description>
</parameter>
</parameters>
-<return> the newly allocated #PangoAttrIterator, which should
-be freed with pango_attr_iterator_destroy().
+<return> a glyph index into @font, or %PANGO_GLYPH_EMPTY
</return>
</function>
@@ -2956,11 +3048,13 @@
</return>
</function>
-<function name="pango_font_description_hash">
+<function name="pango_font_description_to_string">
<description>
-Computes a hash of a #PangoFontDescription structure suitable
-to be used, for example, as an argument to g_hash_table_new().
-The hash value is independent of @desc-&gt;mask.
+Creates a string representation of a font description. See
+pango_font_description_from_string() for a description of the
+format of the string representation. The family list in the
+string description will only have a terminating comma if the
+last word of the list is a valid style option.
</description>
@@ -2970,18 +3064,44 @@
</parameter_description>
</parameter>
</parameters>
-<return> the hash value.
+<return> a new string that must be freed with g_free().
</return>
</function>
-<function name="pango_font_face_is_synthesized">
+<function name="pango_layout_line_get_extents">
<description>
-Return value: whether @face is synthesized.
+Computes the logical and ink extents of a layout line. See
+pango_font_get_glyph_extents() for details about the interpretation
+of the rectangles.
</description>
<parameters>
-<parameter name="face">
-<parameter_description> a #PangoFontFace
+<parameter name="line">
+<parameter_description> a #PangoLayoutLine
+</parameter_description>
+</parameter>
+<parameter name="ink_rect">
+<parameter_description> rectangle used to store the extents of the glyph string
+as drawn, or %NULL
+</parameter_description>
+</parameter>
+<parameter name="logical_rect">
+<parameter_description> rectangle used to store the logical extents of the glyph
+string, or %NULL
+</parameter_description>
+</parameter>
+</parameters>
+<return></return>
+</function>
+
+<function name="pango_font_face_is_synthesized">
+<description>
+Return value: whether @face is synthesized.
+
+</description>
+<parameters>
+<parameter name="face">
+<parameter_description> a #PangoFontFace
</parameter_description>
</parameter>
</parameters>
@@ -3165,7 +3285,7 @@
</description>
<parameters>
<parameter name="color">
-<parameter_description> an allocated #PangoColor
+<parameter_description> an allocated #PangoColor, may be %NULL
</parameter_description>
</parameter>
</parameters>
@@ -3196,12 +3316,34 @@
</return>
</function>
+<function name="pango_glyph_item_copy">
+<description>
+Make a deep copy an existing #PangoGlyphItem structure.
+
+
+</description>
+<parameters>
+<parameter name="orig">
+<parameter_description> a #PangoGlyphItem, may be %NULL
+</parameter_description>
+</parameter>
+</parameters>
+<return> the newly allocated #PangoGlyphItem, which should
+be freed with pango_glyph_item_free(), or %NULL
+if @orig was %NULL.
+
+Since: 1.20
+</return>
+</function>
+
<function name="pango_cairo_context_set_font_options">
<description>
Sets the font options used when rendering text with this context.
These options override any options that pango_cairo_update_context()
derives from the target surface.
+Since: 1.10
+
</description>
<parameters>
<parameter name="context">
@@ -3252,23 +3394,24 @@
<return></return>
</function>
-<function name="pango_font_map_get_shape_engine_type">
+<function name="pango_layout_set_wrap">
<description>
-Return value: the ID string for shape engines for
+Sets the wrap mode; the wrap mode only has effect if a width
+is set on the layout with pango_layout_set_width().
+To turn off wrapping, set the width to -1.
</description>
<parameters>
-<parameter name="fontmap">
-<parameter_description> a #PangoFontMap
+<parameter name="layout">
+<parameter_description> a #PangoLayout
+</parameter_description>
+</parameter>
+<parameter name="wrap">
+<parameter_description> the wrap mode
</parameter_description>
</parameter>
</parameters>
-<return> the ID string for shape engines for
-this fontmap. Owned by Pango, should not be modified
-or freed.
-
-Since: 1.4
-</return>
+<return></return>
</function>
<function name="pango_attr_shape_new_with_data">
@@ -3383,12 +3526,13 @@
</description>
<parameters>
<parameter name="item">
-<parameter_description> a #PangoItem
+<parameter_description> a #PangoItem, may be %NULL
</parameter_description>
</parameter>
</parameters>
<return> the newly allocated #PangoItem, which should
-be freed with pango_item_free().
+be freed with pango_item_free(), or %NULL if
+ item was NULL.
</return>
</function>
@@ -3404,7 +3548,7 @@
For better accuracy, you should use pango_matrix_transform_rectangle() on
original rectangle in Pango units and convert to pixels afterward
-using pango_extents_to_pixels() as @ink_rect.
+using pango_extents_to_pixels()'s first argument.
Since: 1.16
@@ -3442,17 +3586,48 @@
</return>
</function>
-<function name="pango_ot_ruleset_description_free">
+<function name="pango_cairo_create_context">
<description>
-Frees a ruleset description allocated by
-pango_ot_ruleset_description_copy().
+Creates a context object set up to match the current transformation
+and target surface of the Cairo context. This context can then be
+used to create a layout using pango_layout_new().
+
+This function is a convenience function that creates a context using
+the default font map, then updates it to @cr. If you just need to
+create a layout for use with @cr and do not need to access #PangoContext
+directly, you can use pango_cairo_create_layout() instead.
-Since: 1.18
</description>
<parameters>
-<parameter name="desc">
-<parameter_description> an allocated #PangoOTRulesetDescription
+<parameter name="cr">
+<parameter_description> a Cairo context
+</parameter_description>
+</parameter>
+</parameters>
+<return> the newly created #PangoContext. Free with
+g_object_unref().
+
+Since: 1.22
+</return>
+</function>
+
+<function name="pango_layout_iter_get_char_extents">
+<description>
+Gets the extents of the current character, in layout coordinates
+(origin is the top left of the entire layout). Only logical extents
+can sensibly be obtained for characters; ink extents make sense only
+down to the level of clusters.
+
+
+</description>
+<parameters>
+<parameter name="iter">
+<parameter_description> a #PangoLayoutIter
+</parameter_description>
+</parameter>
+<parameter name="logical_rect">
+<parameter_description> rectangle to fill with logical extents
</parameter_description>
</parameter>
</parameters>
@@ -3503,7 +3678,7 @@
<description>
This is a convenience function that
for each feature in the feature map array @features
-converts the feature name to a #PangoOTTag feature tag using FT_MAKE_TAG()
+converts the feature name to a #PangoOTTag feature tag using PANGO_OT_TAG_MAKE()
and calls pango_ot_ruleset_maybe_add_feature() on it.
@@ -3533,25 +3708,6 @@
</return>
</function>
-<function name="pango_xft_font_get_unknown_glyph">
-<description>
-Return value: a glyph index into @font.
-
-</description>
-<parameters>
-<parameter name="font">
-<parameter_description> a #PangoFont.
-</parameter_description>
-</parameter>
-<parameter name="wc">
-<parameter_description> the Unicode character for which a glyph is needed.
-</parameter_description>
-</parameter>
-</parameters>
-<return> a glyph index into @font.
-</return>
-</function>
-
<function name="pango_fontset_get_metrics">
<description>
Get overall metric information for the fonts in the fontset.
@@ -3591,24 +3747,21 @@
<return></return>
</function>
-<function name="pango_ft2_get_unknown_glyph">
+<function name="pango_attr_list_get_iterator">
<description>
-Return the index of a glyph suitable for drawing unknown characters with
- font, or %PANGO_GLYPH_EMPTY if no suitable glyph found.
-
-If you want to draw an unknown-box for a character that is not covered
-by the font,
-use PANGO_GET_UNKNOWN_GLYPH() instead.
+Create a iterator initialized to the beginning of the list.
+ list must not be modified until this iterator is freed.
</description>
<parameters>
-<parameter name="font">
-<parameter_description> a #PangoFont
+<parameter name="list">
+<parameter_description> a #PangoAttrList
</parameter_description>
</parameter>
</parameters>
-<return> a glyph index into @font, or %PANGO_GLYPH_EMPTY
+<return> the newly allocated #PangoAttrIterator, which should
+be freed with pango_attr_iterator_destroy().
</return>
</function>
@@ -3631,20 +3784,21 @@
</return>
</function>
-<function name="pango_context_get_language">
+<function name="pango_renderer_deactivate">
<description>
-Retrieves the global language tag for the context.
+Cleans up after rendering operations on @renderer. See
+docs for pango_renderer_activate().
+Since: 1.8
</description>
<parameters>
-<parameter name="context">
-<parameter_description> a #PangoContext
+<parameter name="renderer">
+<parameter_description> a #PangoRenderer
</parameter_description>
</parameter>
</parameters>
-<return> the global language tag.
-</return>
+<return></return>
</function>
<function name="pango_font_metrics_get_approximate_digit_width">
@@ -3889,6 +4043,11 @@
glyphs for all characters in the layout text were found, or more
than zero otherwise.
+This function can be used to determine if there are any fonts
+available to render all characters in a certain string, or when
+used in combination with %PANGO_ATTR_FALLBACK, to check if a
+certain font supports all the characters in the string.
+
</description>
<parameters>
@@ -4137,30 +4296,48 @@
<return></return>
</function>
-<function name="pango_find_map">
+<function name="pango_layout_set_height">
<description>
-Locate a #PangoMap for a particular engine type and render
-type. The resulting map can be used to determine the engine
-for each character.
+Sets the height to which the #PangoLayout should be ellipsized at. There
+are two different behaviors, based on whether @height is positive or
+negative.
+
+If @height is positive, it will be the maximum height of the layout. Only
+lines would be shown that would fit, and if there is any text omitted,
+an ellipsis added. At least one line is included in each paragraph regardless
+of how small the height value is. A value of zero will render exactly one
+line for the entire layout.
+
+If @height is negative, it will be the (negative of) maximum number of lines per
+paragraph. That is, the total number of lines shown may well be more than
+this value if the layout contains multiple paragraphs of text.
+The default value of -1 means that first line of each paragraph is ellipsized.
+This behvaior may be changed in the future to act per layout instead of per
+paragraph. File a bug against pango at &lt;ulink
+url="http://bugzilla.gnome.org/"&gt;http://bugzilla.gnome.org/&lt;/ulink&gt; if your
+code relies on this behavior.
+
+Height setting only has effect if a positive width is set on
+ layout and ellipsization mode of @layout is not %PANGO_ELLIPSIZE_NONE.
+The behavior is undefined if a height other than -1 is set and
+ellipsization mode is set to %PANGO_ELLIPSIZE_NONE, and may change in the
+future.
+Since: 1.20
</description>
<parameters>
-<parameter name="language">
-<parameter_description> the language tag for which to find the map
-</parameter_description>
-</parameter>
-<parameter name="engine_type_id">
-<parameter_description> the engine type for the map to find
+<parameter name="layout">
+<parameter_description> a #PangoLayout.
</parameter_description>
</parameter>
-<parameter name="render_type_id">
-<parameter_description> the render type for the map to find
+<parameter name="height">
+<parameter_description> the desired height of the layout in Pango units if positive,
+or desired number of lines if negative.
</parameter_description>
</parameter>
</parameters>
-<return> the suitable #PangoMap.
-</return>
+<return></return>
</function>
<function name="pango_context_get_font_description">
@@ -4303,20 +4480,28 @@
<return></return>
</function>
-<function name="pango_font_describe_with_absolute_size">
+<function name="pango_context_load_fontset">
<description>
-Return value: a newly-allocated #PangoFontDescription object.
+Load a set of fonts in the context that can be used to render
+a font matching @desc.
+
</description>
<parameters>
-<parameter name="font">
-<parameter_description> a #PangoFont
+<parameter name="context">
+<parameter_description> a #PangoContext
+</parameter_description>
+</parameter>
+<parameter name="desc">
+<parameter_description> a #PangoFontDescription describing the fonts to load
+</parameter_description>
+</parameter>
+<parameter name="language">
+<parameter_description> a #PangoLanguage the fonts will be used for
</parameter_description>
</parameter>
</parameters>
-<return> a newly-allocated #PangoFontDescription object.
-
-Since: 1.14
+<return> the fontset, or %NULL if no font matched.
</return>
</function>
@@ -4342,21 +4527,20 @@
<return></return>
</function>
-<function name="pango_matrix_get_font_scale_factor">
+<function name="pango_layout_get_alignment">
<description>
-Return value: the scale factor of @matrix on the height of the font,
+Gets the alignment for the layout: how partial lines are
+positioned within the horizontal space available.
+
</description>
<parameters>
-<parameter name="matrix">
-<parameter_description> a #PangoMatrix, may be %NULL
+<parameter name="layout">
+<parameter_description> a #PangoLayout
</parameter_description>
</parameter>
</parameters>
-<return> the scale factor of @matrix on the height of the font,
-or 1.0 if @matrix is %NULL.
-
-Since: 1.12
+<return> the alignment.
</return>
</function>
@@ -4389,20 +4573,21 @@
</return>
</function>
-<function name="pango_attr_list_unref">
+<function name="pango_attr_type_register">
<description>
-Decrease the reference count of the given attribute list by one.
-If the result is zero, free the attribute list and the attributes
-it contains.
+Allocate a new attribute type ID. The attribute type name can be accessed
+later by using pango_attr_type_get_name().
+
</description>
<parameters>
-<parameter name="list">
-<parameter_description> a #PangoAttrList
+<parameter name="name">
+<parameter_description> an identifier for the type
</parameter_description>
</parameter>
</parameters>
-<return></return>
+<return> the new type ID.
+</return>
</function>
<function name="pango_font_metrics_get_strikethrough_thickness">
@@ -4463,12 +4648,12 @@
</parameter>
<parameter name="trailing">
<parameter_description> an integer indicating the edge of the grapheme to retrieve
-the position of. If 0, the trailing edge of the grapheme,
-if &gt; 0, the leading of the grapheme.
+the position of. If &gt; 0, the trailing edge of the grapheme,
+if 0, the leading of the grapheme.
</parameter_description>
</parameter>
<parameter name="x_pos">
-<parameter_description> location to store the x_offset (in #PangoGlyphUnit)
+<parameter_description> location to store the x_offset (in Pango unit)
</parameter_description>
</parameter>
</parameters>
@@ -4509,10 +4694,9 @@
<description>
Clear all cached information and fontsets for this font map;
this should be called whenever there is a change in the
-output of the default_substitute() virtual function.
-
-This function is intended to be used only by backend implementations
-deriving from #PangoFcFontmap.
+output of the default_substitute() virtual function of the
+font map, or if fontconfig has been reinitialized to new
+configuration.
Since: 1.4
@@ -4599,30 +4783,32 @@
to write @language or if nothing is known about @language
(including the case that @language is %NULL),
%FALSE otherwise.
-
+
Since: 1.4
</return>
</function>
-<function name="pango_glyph_string_get_width">
+<function name="pango_xft_shutdown_display">
<description>
-Computes the logical width of the glyph string as can also be computed
-using pango_glyph_string_extents(). However, since this only computes the
-width, it's much faster. This is in fact only a convenience function that
-computes the sum of geometry.width for each glyph in the @glyphs.
+Release any resources that have been cached for the
+combination of @display and @screen. Note that when the
+X display is closed, resources are released automatically,
+without needing to call this function.
+Since: 1.2
</description>
<parameters>
-<parameter name="glyphs">
-<parameter_description> a #PangoGlyphString
+<parameter name="display">
+<parameter_description> an X display
+</parameter_description>
+</parameter>
+<parameter name="screen">
+<parameter_description> the screen number of a screen within @display
</parameter_description>
</parameter>
</parameters>
-<return> the logical width of the glyph string.
-
-Since: 1.14
-</return>
+<return></return>
</function>
<function name="pango_font_family_get_name">
@@ -4708,7 +4894,7 @@
</parameter_description>
</parameter>
</parameters>
-<return>the font loaded, or %NULL if no font matched.
+<return> the font loaded, or %NULL if no font matched.
</return>
</function>
@@ -4830,20 +5016,18 @@
</description>
<parameters>
<parameter name="item">
-<parameter_description> a #PangoItem
+<parameter_description> a #PangoItem, may be %NULL
</parameter_description>
</parameter>
</parameters>
<return></return>
</function>
-<function name="pango_font_description_to_string">
+<function name="pango_font_description_hash">
<description>
-Creates a string representation of a font description. See
-pango_font_description_from_string() for a description of the
-format of the string representation. The family list in the
-string description will only have a terminating comma if the
-last word of the list is a valid style option.
+Computes a hash of a #PangoFontDescription structure suitable
+to be used, for example, as an argument to g_hash_table_new().
+The hash value is independent of @desc-&gt;mask.
</description>
@@ -4853,7 +5037,7 @@
</parameter_description>
</parameter>
</parameters>
-<return> a new string that must be freed with g_free().
+<return> the hash value.
</return>
</function>
@@ -5002,22 +5186,31 @@
</return>
</function>
-<function name="pango_ft2_font_map_new">
+<function name="pango_fc_font_description_from_pattern">
<description>
-Create a new #PangoFT2FontMap object; a fontmap is used
-to cache information about available fonts, and holds
-certain global parameters such as the resolution and
-the default substitute function (see
-pango_ft2_font_map_set_default_substitute()).
+Creates a #PangoFontDescription that matches the specified
+Fontconfig pattern as closely as possible. Many possible Fontconfig
+pattern values, such as %FC_RASTERIZER or %FC_DPI, don't make sense in
+the context of #PangoFontDescription, so will be ignored.
</description>
<parameters>
+<parameter name="pattern">
+<parameter_description> a #FcPattern
+</parameter_description>
+</parameter>
+<parameter name="include_size">
+<parameter_description> if %TRUE, the pattern will include the size from
+the @pattern; otherwise the resulting pattern will be unsized.
+(only %FC_SIZE is examined, not %FC_PIXEL_SIZE)
+</parameter_description>
+</parameter>
</parameters>
-<return> the newly created fontmap object. Unref
-with g_object_unref() when you are finished with it.
+<return> a new #PangoFontDescription. Free with
+pango_font_description_free().
-Since: 1.2
+Since: 1.4
</return>
</function>
@@ -5081,38 +5274,19 @@
</return>
</function>
-<function name="pango_cairo_show_layout">
-<description>
-Draws a #PangoLayoutLine in the specified cairo context.
-The top-left corner of the #PangoLayout will be drawn
-at the current point of the cairo context.
-
-Since: 1.10
-
-</description>
-<parameters>
-<parameter name="cr">
-<parameter_description> a Cairo context
-</parameter_description>
-</parameter>
-<parameter name="layout">
-<parameter_description> a Pango layout
-</parameter_description>
-</parameter>
-</parameters>
-<return></return>
-</function>
-
<function name="pango_layout_set_ellipsize">
<description>
Sets the type of ellipsization being performed for @layout.
Depending on the ellipsization mode @ellipsize text is
-removed from the start, middle, or end of lines so they
-fit within the width of layout set with pango_layout_set_width ().
+removed from the start, middle, or end of text so they
+fit within the width and height of layout set with
+pango_layout_set_width() and pango_layout_set_height().
If the layout contains characters such as newlines that
-force it to be layed out in multiple lines, then each line
-is ellipsized separately.
+force it to be layed out in multiple paragraphs, then whether
+each paragraph is ellipsized separately or the entire layout
+is ellipsized as a whole depends on the set height of the layout.
+See pango_layout_set_height() for details.
Since: 1.6
@@ -5130,27 +5304,25 @@
<return></return>
</function>
-<function name="pango_xft_shutdown_display">
+<function name="pango_glyph_string_get_width">
<description>
-Release any resources that have been cached for the
-combination of @display and @screen. Note that when the
-X display is closed, resources are released automatically,
-without needing to call this function.
+Computes the logical width of the glyph string as can also be computed
+using pango_glyph_string_extents(). However, since this only computes the
+width, it's much faster. This is in fact only a convenience function that
+computes the sum of geometry.width for each glyph in the @glyphs.
-Since: 1.2
</description>
<parameters>
-<parameter name="display">
-<parameter_description> an X display
-</parameter_description>
-</parameter>
-<parameter name="screen">
-<parameter_description> the screen number of a screen within @display
+<parameter name="glyphs">
+<parameter_description> a #PangoGlyphString
</parameter_description>
</parameter>
</parameters>
-<return></return>
+<return> the logical width of the glyph string.
+
+Since: 1.14
+</return>
</function>
<function name="pango_layout_set_markup">
@@ -5178,6 +5350,31 @@
<return></return>
</function>
+<function name="pango_context_set_base_dir">
+<description>
+Sets the base direction for the context.
+
+The base direction is used in applying the Unicode bidirectional
+algorithm; if the @direction is %PANGO_DIRECTION_LTR or
+%PANGO_DIRECTION_RTL, then the value will be used as the paragraph
+direction in the Unicode bidirectional algorithm. A value of
+%PANGO_DIRECTION_WEAK_LTR or %PANGO_DIRECTION_WEAK_RTL is used only
+for paragraphs that do not contain any strong characters themselves.
+
+</description>
+<parameters>
+<parameter name="context">
+<parameter_description> a #PangoContext
+</parameter_description>
+</parameter>
+<parameter name="direction">
+<parameter_description> the new base direction
+</parameter_description>
+</parameter>
+</parameters>
+<return></return>
+</function>
+
<function name="pango_glyph_string_get_logical_widths">
<description>
Given a #PangoGlyphString resulting from pango_shape() and the corresponding
@@ -5266,16 +5463,32 @@
</return>
</function>
-<function name="pango_script_iter_free">
+<function name="pango_renderer_part_changed">
<description>
-Frees a #PangoScriptIter created with pango_script_iter_new().
+Informs Pango that the way that the rendering is done
+for @part has changed in a way that would prevent multiple
+pieces being joined together into one drawing call. For
+instance, if a subclass of #PangoRenderer was to add a stipple
+option for drawing underlines, it needs to call
-Since: 1.4
+&lt;informalexample&gt;&lt;programlisting&gt;
+pango_renderer_part_changed (render, PANGO_RENDER_PART_UNDERLINE);
+&lt;/programlisting&gt;&lt;/informalexample&gt;
+
+When the stipple changes or underlines with different stipples
+might be joined together. Pango automatically calls this for
+changes to colors. (See pango_renderer_set_color())
+
+Since: 1.8
</description>
<parameters>
-<parameter name="iter">
-<parameter_description> a #PangoScriptIter
+<parameter name="renderer">
+<parameter_description> a #PangoRenderer
+</parameter_description>
+</parameter>
+<parameter name="part">
+<parameter_description> the part for which rendering has changed.
</parameter_description>
</parameter>
</parameters>
@@ -5286,7 +5499,9 @@
<description>
Computes the logical and ink extents of @layout_line in device units.
This function just calls pango_layout_line_get_extents() followed by
-pango_extents_to_pixels().
+two pango_extents_to_pixels() calls, rounding @ink_rect and @logical_rect
+such that the rounded rectangles fully contain the unrounded one (that is,
+passes them as first argument to pango_extents_to_pixels()).
</description>
<parameters>
@@ -5378,27 +5593,22 @@
<return></return>
</function>
-<function name="pango_x_font_cache_load">
+<function name="pango_layout_new">
<description>
-Loads a #XFontStruct from a X Logical Font Description. The
-result may be newly loaded, or it may have been previously
-stored.
+Create a new #PangoLayout object with attributes initialized to
+default values for a particular #PangoContext.
</description>
<parameters>
-<parameter name="cache">
-<parameter_description> a #PangoXFontCache
-</parameter_description>
-</parameter>
-<parameter name="xlfd">
-<parameter_description> the X Logical Font Description to load.
+<parameter name="context">
+<parameter_description> a #PangoContext
</parameter_description>
</parameter>
</parameters>
-<return> The font structure, or %NULL if the font could
-not be loaded. In order to free this structure, you must call
-pango_x_font_cache_unload().
+<return> the newly allocated #PangoLayout, with a reference
+count of one, which should be freed with
+g_object_unref().
</return>
</function>
@@ -5625,51 +5835,74 @@
Converts extents from Pango units to device units, dividing by the
%PANGO_SCALE factor and performing rounding.
-The ink rectangle is converted by flooring the x/y coordinates and extending
+The @inclusive rectangle is converted by flooring the x/y coordinates and extending
width/height, such that the final rectangle completely includes the original
rectangle.
-The logical rectangle is converted by rounding the coordinates
-of the rectangle to the nearest device unit.
+The @nearest rectangle is converted by rounding the coordinates
+of the rectangle to the nearest device unit (pixel).
-Note that in certain situations you may want pass a logical extents
-rectangle to this function as @ink_rect. The rule is: if you want the
-resulting device-space rectangle to completely contain the original
-rectangle, pass it in as @ink_rect.
+The rule to which argument to use is: if you want the resulting device-space
+rectangle to completely contain the original rectangle, pass it in as @inclusive.
+If you want two touching-but-not-overlapping rectangles stay
+touching-but-not-overlapping after rounding to device units, pass them in
+as @nearest.
Since: 1.16
</description>
<parameters>
-<parameter name="ink_rect">
-<parameter_description> ink rectangle to convert, or %NULL.
+<parameter name="inclusive">
+<parameter_description> rectangle to round to pixels inclusively, or %NULL.
</parameter_description>
</parameter>
-<parameter name="logical_rect">
-<parameter_description> logical rectangle to convert, or %NULL.
+<parameter name="nearest">
+<parameter_description> rectangle to round to nearest pixels, or %NULL.
</parameter_description>
</parameter>
</parameters>
<return></return>
</function>
-<function name="pango_ot_tag_to_language">
+<function name="pango_glyph_string_index_to_x">
<description>
-Finds a #PangoLanguage corresponding to @language_tag.
-
+Converts from character position to x position. (X position
+is measured from the left edge of the run). Character positions
+are computed by dividing up each cluster into equal portions.
</description>
<parameters>
-<parameter name="language_tag">
-<parameter_description> A #PangoOTTag OpenType language-system tag
+<parameter name="glyphs">
+<parameter_description> the glyphs return from pango_shape()
+</parameter_description>
+</parameter>
+<parameter name="text">
+<parameter_description> the text for the run
+</parameter_description>
+</parameter>
+<parameter name="length">
+<parameter_description> the number of bytes (not characters) in @text.
+</parameter_description>
+</parameter>
+<parameter name="analysis">
+<parameter_description> the analysis information return from pango_itemize()
+</parameter_description>
+</parameter>
+<parameter name="index_">
+<parameter_description> the byte index within @text
+</parameter_description>
+</parameter>
+<parameter name="trailing">
+<parameter_description> whether we should compute the result for the beginning (%FALSE)
+or end (%TRUE) of the character.
+</parameter_description>
+</parameter>
+<parameter name="x_pos">
+<parameter_description> location to store result
</parameter_description>
</parameter>
</parameters>
-<return> #PangoLanguage best matching @language_tag or
-#PangoLanguage corresponding to the string "xx" if none found.
-
-Since: 1.18
-</return>
+<return></return>
</function>
<function name="pango_x_get_context">
@@ -5735,32 +5968,21 @@
</return>
</function>
-<function name="pango_break">
+<function name="pango_attr_list_insert">
<description>
-Determines possible line, word, and character breaks
-for a string of Unicode text with a single analysis. For most
-purposes you may want to use pango_get_log_attrs().
+Insert the given attribute into the #PangoAttrList. It will
+be inserted after all other attributes with a matching
+ start_index
</description>
<parameters>
-<parameter name="text">
-<parameter_description> the text to process
-</parameter_description>
-</parameter>
-<parameter name="length">
-<parameter_description> length of @text in bytes (may be -1 if @text is nul-terminated)
-</parameter_description>
-</parameter>
-<parameter name="analysis">
-<parameter_description> #PangoAnalysis structure from pango_itemize()
-</parameter_description>
-</parameter>
-<parameter name="attrs">
-<parameter_description> an array to store character information in
+<parameter name="list">
+<parameter_description> a #PangoAttrList
</parameter_description>
</parameter>
-<parameter name="attrs_len">
-<parameter_description> size of the array passed as @attrs
+<parameter name="attr">
+<parameter_description> the attribute to insert. Ownership of this value is
+assumed by the list.
</parameter_description>
</parameter>
</parameters>
@@ -5819,6 +6041,25 @@
<return></return>
</function>
+<function name="pango_font_map_get_shape_engine_type">
+<description>
+Return value: the ID string for shape engines for
+
+</description>
+<parameters>
+<parameter name="fontmap">
+<parameter_description> a #PangoFontMap
+</parameter_description>
+</parameter>
+</parameters>
+<return> the ID string for shape engines for
+this fontmap. Owned by Pango, should not be modified
+or freed.
+
+Since: 1.4
+</return>
+</function>
+
<function name="pango_x_render_layout_line">
<description>
Renders a #PangoLayoutLine onto an X drawable.
@@ -5895,26 +6136,16 @@
</return>
</function>
-<function name="pango_attr_iterator_range">
+<function name="pango_layout_line_unref">
<description>
-Get the range of the current segment. Note that the
-stored return values are signed, not unsigned like
-the values in #PangoAttribute. To deal with this API
-oversight, stored return values that wouldn't fit into
-a signed integer are clamped to %G_MAXINT.
+Decrease the reference count of a #PangoLayoutLine by one.
+If the result is zero, the line and all associated memory
+will be freed.
</description>
<parameters>
-<parameter name="iterator">
-<parameter_description> a #PangoAttrIterator
-</parameter_description>
-</parameter>
-<parameter name="start">
-<parameter_description> location to store the start of the range
-</parameter_description>
-</parameter>
-<parameter name="end">
-<parameter_description> location to store the end of the range
+<parameter name="line">
+<parameter_description> a #PangoLayoutLine
</parameter_description>
</parameter>
</parameters>
@@ -5933,7 +6164,7 @@
</parameter_description>
</parameter>
<parameter name="attrs">
-<parameter_description> a #PangoAttrList
+<parameter_description> a #PangoAttrList, can be %NULL
</parameter_description>
</parameter>
</parameters>
@@ -6013,6 +6244,19 @@
</return>
</function>
+<function name="pango_attr_list_new">
+<description>
+Create a new empty attribute list with a reference count of one.
+
+
+</description>
+<parameters>
+</parameters>
+<return> the newly allocated #PangoAttrList, which should
+be freed with pango_attr_list_unref().
+</return>
+</function>
+
<function name="pango_glyph_item_letter_space">
<description>
Adds spacing between the graphemes of @glyph_item to
@@ -6092,16 +6336,6 @@
</return>
</function>
-<function name="pango_win32_shutdown_display">
-<description>
-Free cached resources.
-
-</description>
-<parameters>
-</parameters>
-<return></return>
-</function>
-
<function name="pango_parse_markup">
<description>
Parses marked-up text (see
@@ -6155,32 +6389,16 @@
</return>
</function>
-<function name="pango_renderer_part_changed">
+<function name="pango_script_iter_free">
<description>
-Informs Pango that the way that the rendering is done
-for @part has changed in a way that would prevent multiple
-pieces being joined together into one drawing call. For
-instance, if a subclass of #PangoRenderer was to add a stipple
-option for drawing underlines, it needs to call
-
-&lt;informalexample&gt;&lt;programlisting&gt;
-pango_renderer_part_changed (render, PANGO_RENDER_PART_UNDERLINE);
-&lt;/programlisting&gt;&lt;/informalexample&gt;
-
-When the stipple changes or underlines with different stipples
-might be joined together. Pango automatically calls this for
-changes to colors. (See pango_renderer_set_color())
+Frees a #PangoScriptIter created with pango_script_iter_new().
-Since: 1.8
+Since: 1.4
</description>
<parameters>
-<parameter name="renderer">
-<parameter_description> a #PangoRenderer
-</parameter_description>
-</parameter>
-<parameter name="part">
-<parameter_description> the part for which rendering has changed.
+<parameter name="iter">
+<parameter_description> a #PangoScriptIter
</parameter_description>
</parameter>
</parameters>
@@ -6255,6 +6473,29 @@
</return>
</function>
+<function name="pango_cairo_font_map_set_default">
+<description>
+Sets a default #PangoCairoFontMap to use with Cairo.
+
+This can be used to change the Cairo font backend that the
+default fontmap uses for example. The old default font map
+is unreffed and the new font map referenced.
+
+A value of %NULL for @fontmap will cause a new default font
+map to be created on demand, using pango_cairo_font_map_new().
+
+Since: 1.22
+
+</description>
+<parameters>
+<parameter name="fontmap">
+<parameter_description> The new default font map, or %NULL
+</parameter_description>
+</parameter>
+</parameters>
+<return></return>
+</function>
+
<function name="pango_quantize_line_geometry">
<description>
Quantizes the thickness and position of a line, typically an
@@ -6262,12 +6503,16 @@
multiples of %PANGO_SCALE. The purpose of this function is to avoid
such lines looking blurry.
+Care is taken to make sure @thickness is at least one pixel when this
+function returns, but returned @position may become zero as a result
+of rounding.
+
Since: 1.12
</description>
<parameters>
<parameter name="thickness">
-<parameter_description> pointer to the thickness of a line, in Pango scaled units
+<parameter_description> pointer to the thickness of a line, in Pango units
</parameter_description>
</parameter>
<parameter name="position">
@@ -6322,6 +6567,9 @@
valid Unicode character; if you pass in invalid character, the
result is undefined.
+As of Pango 1.18, this function simply returns the return value of
+g_unichar_get_script().
+
</description>
<parameters>
@@ -6348,7 +6596,7 @@
</description>
<parameters>
<parameter name="glyphs">
-<parameter_description> the glyphs return from pango_shape()
+<parameter_description> the glyphs returned from pango_shape()
</parameter_description>
</parameter>
<parameter name="text">
@@ -6364,7 +6612,7 @@
</parameter_description>
</parameter>
<parameter name="x_pos">
-<parameter_description> the x offset (in #PangoGlyphUnit)
+<parameter_description> the x offset (in Pango units)
</parameter_description>
</parameter>
<parameter name="index_">
@@ -6372,7 +6620,7 @@
</parameter_description>
</parameter>
<parameter name="trailing">
-<parameter_description> location to store a integer indicating where
+<parameter_description> location to store a boolean indicating
whether the user clicked on the leading or trailing
edge of the character.
</parameter_description>
@@ -6426,24 +6674,23 @@
<return></return>
</function>
-<function name="pango_layout_set_wrap">
+<function name="_pango_xft_font_get_mini_font">
<description>
-Sets the wrap mode; the wrap mode only has effect if a width
-is set on the layout with pango_layout_set_width(). To turn off wrapping,
-set the width to -1.
+Gets the font used for drawing the digits in the
+missing-character hex squares
+
</description>
<parameters>
-<parameter name="layout">
-<parameter_description> a #PangoLayout
-</parameter_description>
-</parameter>
-<parameter name="wrap">
-<parameter_description> the wrap mode
+<parameter name="xfont">
+<parameter_description> a #PangoXftFont
</parameter_description>
</parameter>
</parameters>
-<return></return>
+<return> the #PangoFont used for the digits; this
+value is associated with the main font and will be freed
+along with the main font.
+</return>
</function>
<function name="pango_ft2_font_map_set_resolution">
@@ -6487,6 +6734,24 @@
<return></return>
</function>
+<function name="pango_layout_get_baseline">
+<description>
+Gets the Y position of baseline of the first line in @layout.
+
+
+</description>
+<parameters>
+<parameter name="layout">
+<parameter_description> a #PangoLayout
+</parameter_description>
+</parameter>
+</parameters>
+<return> baseline of first line, from top of @layout.
+
+Since: 1.22
+</return>
+</function>
+
<function name="pango_context_get_font_map">
<description>
Gets the #PangoFontmap used to look up fonts for this context.
@@ -6580,6 +6845,8 @@
<return> the font options previously set on the context, or %NULL
if no options have been set. This value is owned by the context
and must not be modified or freed.
+
+Since: 1.10
</return>
</function>
@@ -6706,6 +6973,27 @@
<return></return>
</function>
+<function name="pango_attr_list_insert_before">
+<description>
+Insert the given attribute into the #PangoAttrList. It will
+be inserted before all other attributes with a matching
+ start_index
+
+</description>
+<parameters>
+<parameter name="list">
+<parameter_description> a #PangoAttrList
+</parameter_description>
+</parameter>
+<parameter name="attr">
+<parameter_description> the attribute to insert. Ownership of this value is
+assumed by the list.
+</parameter_description>
+</parameter>
+</parameters>
+<return></return>
+</function>
+
<function name="pango_ot_info_find_language">
<description>
Finds the index of a language and its required feature index.
@@ -6778,7 +7066,8 @@
<function name="pango_ft2_font_get_coverage">
<description>
-Gets the #PangoCoverage for a #PangoFT2Font. Use pango_font_get_coverage() instead.
+Gets the #PangoCoverage for a #PangoFT2Font. Use
+pango_font_get_coverage() instead.
</description>
<parameters>
@@ -6868,29 +7157,21 @@
</return>
</function>
-<function name="pango_context_set_base_dir">
+<function name="pango_language_to_string">
<description>
-Sets the base direction for the context.
+Gets the RFC-3066 format string representing the given language tag.
-The base direction is used in applying the Unicode bidirectional
-algorithm; if the @direction is %PANGO_DIRECTION_LTR or
-%PANGO_DIRECTION_RTL, then the value will be used as the paragraph
-direction in the Unicode bidirectional algorithm. A value of
-%PANGO_DIRECTION_WEAK_LTR or %PANGO_DIRECTION_WEAK_RTL is used only
-for paragraphs that do not contain any strong characters themselves.
</description>
<parameters>
-<parameter name="context">
-<parameter_description> a #PangoContext
-</parameter_description>
-</parameter>
-<parameter name="direction">
-<parameter_description> the new base direction
+<parameter name="language">
+<parameter_description> a language tag.
</parameter_description>
</parameter>
</parameters>
-<return></return>
+<return> a string representing the language tag. This is owned by
+Pango and should not be freed.
+</return>
</function>
<function name="pango_tab_array_new_with_positions">
@@ -7183,7 +7464,7 @@
</description>
<parameters>
<parameter name="iter">
-<parameter_description> a #PangoLayoutIter
+<parameter_description> a #PangoLayoutIter, may be %NULL
</parameter_description>
</parameter>
</parameters>
@@ -7297,6 +7578,9 @@
be provided to indicate that the metrics should be retrieved that
correspond to the script(s) used by that language.
+If @font is %NULL, this function gracefully sets some sane values in the
+output variables and returns.
+
</description>
<parameters>
@@ -7316,35 +7600,41 @@
</return>
</function>
-<function name="pango_layout_get_line_readonly">
+<function name="pango_matrix_transform_distance">
<description>
-Retrieves a particular line from a #PangoLayout.
+Transforms the distance vector (@dx,@dy) by @matrix. This is
+similar to pango_matrix_transform_point() except that the translation
+components of the transformation are ignored. The calculation of
+the returned vector is as follows:
-This is a faster alternative to pango_layout_get_line(),
-but the user is not expected
-to modify the contents of the line (glyphs, glyph widths, etc.).
+&lt;programlisting&gt;
+dx2 = dx1 * xx + dy1 * xy;
+dy2 = dx1 * yx + dy1 * yy;
+&lt;/programlisting&gt;
+Affine transformations are position invariant, so the same vector
+always transforms to the same vector. If (@x1,@y1) transforms
+to (@x2,@y2) then (@x1+ dx1,@y1+ dy1) will transform to
+(@x1+ dx2,@y1+ dy2) for all values of @x1 and @x2.
+
+Since: 1.16
</description>
<parameters>
-<parameter name="layout">
-<parameter_description> a #PangoLayout
+<parameter name="matrix">
+<parameter_description> a #PangoMatrix, or %NULL
</parameter_description>
</parameter>
-<parameter name="line">
-<parameter_description> the index of a line, which must be between 0 and
-&lt;literal&gt;pango_layout_get_line_count(layout) - 1&lt;/literal&gt;, inclusive.
+<parameter name="dx">
+<parameter_description> in/out X component of a distance vector
+</parameter_description>
+</parameter>
+<parameter name="dy">
+<parameter_description> yn/out Y component of a distance vector
</parameter_description>
</parameter>
</parameters>
-<return> the requested #PangoLayoutLine, or %NULL if the
-index is out of range. This layout line can
-be ref'ed and retained, but will become invalid
-if changes are made to the #PangoLayout.
-No changes should be made to the line.
-
-Since: 1.16
-</return>
+<return></return>
</function>
<function name="pango_tab_array_set_tab">
@@ -7426,63 +7716,35 @@
<return></return>
</function>
-<function name="pango_matrix_transform_distance">
-<description>
-Transforms the distance vector (@dx,@dy) by @matrix. This is
-similar to pango_matrix_transform_point() except that the translation
-components of the transformation are ignored. The calculation of
-the returned vector is as follows:
-
-&lt;programlisting&gt;
-dx2 = dx1 * xx + dy1 * xy;
-dy2 = dx1 * yx + dy1 * yy;
-&lt;/programlisting&gt;
-
-Affine transformations are position invariant, so the same vector
-always transforms to the same vector. If (@x1,@y1) transforms
-to (@x2,@y2) then (@x1+ dx1,@y1+ dy1) will transform to
-(@x1+ dx2,@y1+ dy2) for all values of @x1 and @x2.
-
-Since: 1.16
-
-</description>
-<parameters>
-<parameter name="matrix">
-<parameter_description> a #PangoMatrix, or %NULL
-</parameter_description>
-</parameter>
-<parameter name="dx">
-<parameter_description> in/out X component of a distance vector
-</parameter_description>
-</parameter>
-<parameter name="dy">
-<parameter_description> yn/out Y component of a distance vector
-</parameter_description>
-</parameter>
-</parameters>
-<return></return>
-</function>
-
-<function name="pango_layout_iter_get_char_extents">
+<function name="pango_layout_get_line_readonly">
<description>
-Gets the extents of the current character, in layout coordinates
-(origin is the top left of the entire layout). Only logical extents
-can sensibly be obtained for characters; ink extents make sense only
-down to the level of clusters.
+Retrieves a particular line from a #PangoLayout.
+
+This is a faster alternative to pango_layout_get_line(),
+but the user is not expected
+to modify the contents of the line (glyphs, glyph widths, etc.).
</description>
<parameters>
-<parameter name="iter">
-<parameter_description> a #PangoLayoutIter
+<parameter name="layout">
+<parameter_description> a #PangoLayout
</parameter_description>
</parameter>
-<parameter name="logical_rect">
-<parameter_description> rectangle to fill with logical extents
+<parameter name="line">
+<parameter_description> the index of a line, which must be between 0 and
+&lt;literal&gt;pango_layout_get_line_count(layout) - 1&lt;/literal&gt;, inclusive.
</parameter_description>
</parameter>
</parameters>
-<return></return>
+<return> the requested #PangoLayoutLine, or %NULL if the
+index is out of range. This layout line can
+be ref'ed and retained, but will become invalid
+if changes are made to the #PangoLayout.
+No changes should be made to the line.
+
+Since: 1.16
+</return>
</function>
<function name="pango_layout_index_to_line_x">
@@ -7520,28 +7782,27 @@
<return></return>
</function>
-<function name="pango_layout_iter_get_cluster_extents">
+<function name="pango_unichar_direction">
<description>
-Gets the extents of the current cluster, in layout coordinates
-(origin is the top left of the entire layout).
+Determines the inherent direction of a character; either
+%PANGO_DIRECTION_LTR, %PANGO_DIRECTION_RTL, or
+%PANGO_DIRECTION_NEUTRAL.
+
+This function is useful to categorize characters into left-to-right
+letters, right-to-left letters, and everything else. If full
+Unicode bidirectional type of a character is needed,
+pango_bidi_type_for_gunichar() can be used instead.
</description>
<parameters>
-<parameter name="iter">
-<parameter_description> a #PangoLayoutIter
-</parameter_description>
-</parameter>
-<parameter name="ink_rect">
-<parameter_description> rectangle to fill with ink extents, or %NULL
-</parameter_description>
-</parameter>
-<parameter name="logical_rect">
-<parameter_description> rectangle to fill with logical extents, or %NULL
+<parameter name="ch">
+<parameter_description> a Unicode character
</parameter_description>
</parameter>
</parameters>
-<return></return>
+<return> the direction of the character.
+</return>
</function>
<function name="pango_attr_size_new_absolute">
@@ -7586,27 +7847,22 @@
</description>
<parameters>
<parameter name="desc">
-<parameter_description> a #PangoFontDescription
+<parameter_description> a #PangoFontDescription, may be %NULL
</parameter_description>
</parameter>
</parameters>
<return> the newly allocated #PangoFontDescription, which should
-be freed with pango_font_description_free().
+be freed with pango_font_description_free(), or %NULL
+if @desc was %NULL.
</return>
</function>
-<function name="pango_ot_buffer_clear">
+<function name="pango_win32_shutdown_display">
<description>
-Empties a #PangoOTBuffer, make it ready to add glyphs to.
-
-Since: 1.4
+Free cached resources.
</description>
<parameters>
-<parameter name="buffer">
-<parameter_description> a #PangoOTBuffer
-</parameter_description>
-</parameter>
</parameters>
<return></return>
</function>
@@ -7660,7 +7916,7 @@
</parameter_description>
</parameter>
</parameters>
-<return> the indent.
+<return> the indent in Pango units.
</return>
</function>
@@ -7764,7 +8020,8 @@
</parameter_description>
</parameter>
</parameters>
-<return> the #cairo_scaled_font_t used by @font
+<return> the #cairo_scaled_font_t used by @font,
+or %NULL if @font is %NULL.
Since: 1.18
</return>
@@ -7878,7 +8135,7 @@
</description>
<parameters>
</parameters>
-<return>value: The encoded version of Pango library
+<return> The encoded version of Pango library
available at run time.
Since: 1.16
@@ -7910,7 +8167,7 @@
</parameter_description>
</parameter>
</parameters>
-<return>the fontset, or %NULL if no font matched.
+<return> the fontset, or %NULL if no font matched.
</return>
</function>
@@ -8115,30 +8372,34 @@
</description>
<parameters>
<parameter name="src">
-<parameter_description> color to copy
+<parameter_description> color to copy, may be %NULL
</parameter_description>
</parameter>
</parameters>
<return> the newly allocated #PangoColor, which should
-be freed with pango_color_free().
+be freed with pango_color_free(), or %NULL
+if @src was %NULL.
</return>
</function>
-<function name="pango_attribute_copy">
+<function name="pango_tab_array_resize">
<description>
-Make a copy of an attribute.
+Resizes a tab array. You must subsequently initialize any tabs that
+were added as a result of growing the array.
</description>
<parameters>
-<parameter name="attr">
-<parameter_description> a #PangoAttribute
+<parameter name="tab_array">
+<parameter_description> a #PangoTabArray
+</parameter_description>
+</parameter>
+<parameter name="new_size">
+<parameter_description> new size of the array
</parameter_description>
</parameter>
</parameters>
-<return> the newly allocated #PangoAttribute, which should be
-freed with pango_attribute_destroy().
-</return>
+<return></return>
</function>
<function name="pango_win32_font_select_font">
@@ -8331,21 +8592,24 @@
</return>
</function>
-<function name="pango_attr_family_new">
+<function name="pango_context_set_language">
<description>
-Create a new font family attribute.
-
+Sets the global language tag for the context. The default language
+for the locale of the running process can be found using
+pango_language_get_default().
</description>
<parameters>
-<parameter name="family">
-<parameter_description> the family or comma separated list of families
+<parameter name="context">
+<parameter_description> a #PangoContext
+</parameter_description>
+</parameter>
+<parameter name="language">
+<parameter_description> the new language tag.
</parameter_description>
</parameter>
</parameters>
-<return> the newly allocated #PangoAttribute, which should be
-freed with pango_attribute_destroy().
-</return>
+<return></return>
</function>
<function name="pango_cairo_font_map_new_for_font_type">
@@ -8368,7 +8632,7 @@
<return> the newly allocated #PangoFontMap of suitable type
which should be freed with g_object_unref(),
or %NULL if the requested cairo font backend is
-not supported.
+not supported / compiled in.
Since: 1.18
</return>
@@ -8475,6 +8739,30 @@
</return>
</function>
+<function name="pango_renderer_get_layout">
+<description>
+Gets the layout currently being rendered using @renderer.
+Calling this function only makes sense from inside a subclass's
+methods, like in its draw_shape&lt;!----&gt;() for example.
+
+The returned layout should not be modified while still being
+rendered.
+
+
+</description>
+<parameters>
+<parameter name="renderer">
+<parameter_description> a #PangoRenderer
+</parameter_description>
+</parameter>
+</parameters>
+<return> the layout, or %NULL if no layout is being
+rendered using @renderer at this time.
+
+Since: 1.20
+</return>
+</function>
+
<function name="pango_attr_iterator_get_font">
<description>
Get the font and other attributes at the current iterator position.
@@ -8528,89 +8816,83 @@
</return>
</function>
-<function name="pango_attr_list_new">
-<description>
-Create a new empty attribute list with a reference count of one.
-
-
-</description>
-<parameters>
-</parameters>
-<return> the newly allocated #PangoAttrList, which should
-be freed with pango_attr_list_unref().
-</return>
-</function>
-
-<function name="pango_unichar_direction">
+<function name="_pango_fc_font_set_decoder">
<description>
-Determines the direction of a character; either
-%PANGO_DIRECTION_LTR, %PANGO_DIRECTION_RTL, or
-%PANGO_DIRECTION_NEUTRAL.
+This sets a custom decoder for this font. Any previous decoder
+will be released before this one is set.
+Since: 1.6
</description>
<parameters>
-<parameter name="ch">
-<parameter_description> a Unicode character
+<parameter name="font">
+<parameter_description> a #PangoFcFont
+</parameter_description>
+</parameter>
+<parameter name="decoder">
+<parameter_description> a #PangoFcDecoder to set for this font
</parameter_description>
</parameter>
</parameters>
-<return> the direction of the character, as used in the
-Unicode bidirectional algorithm.
-</return>
+<return></return>
</function>
<function name="pango_cairo_font_map_get_default">
<description>
-Gets a default font map to use with Cairo.
+Gets a default #PangoCairoFontMap to use with Cairo.
+
+Note that the type of the returned object will depend
+on the particular font backend Cairo was compiled to use;
+You generally should only use the #PangoFontMap and
+#PangoCairoFontMap interfaces on the returned object.
+
+The default Cairo fontmap can be changed by using
+pango_cairo_font_map_set_default(). This can be used to
+change the Cairo font backend that the default fontmap
+uses for example.
</description>
<parameters>
</parameters>
-<return> the default Cairo fontmap for #Pango. This
+<return> the default Cairo fontmap for Pango. This
object is owned by Pango and must not be freed.
Since: 1.10
</return>
</function>
-<function name="pango_attr_list_insert_before">
+<function name="pango_ot_ruleset_description_free">
<description>
-Insert the given attribute into the #PangoAttrList. It will
-be inserted before all other attributes with a matching
- start_index
+Frees a ruleset description allocated by
+pango_ot_ruleset_description_copy().
+
+Since: 1.18
</description>
<parameters>
-<parameter name="list">
-<parameter_description> a #PangoAttrList
-</parameter_description>
-</parameter>
-<parameter name="attr">
-<parameter_description> the attribute to insert. Ownership of this value is
-assumed by the list.
+<parameter name="desc">
+<parameter_description> an allocated #PangoOTRulesetDescription
</parameter_description>
</parameter>
</parameters>
<return></return>
</function>
-<function name="pango_renderer_deactivate">
+<function name="pango_context_get_language">
<description>
-Cleans up after rendering operations on @renderer. See
-docs for pango_renderer_activate().
+Retrieves the global language tag for the context.
-Since: 1.8
</description>
<parameters>
-<parameter name="renderer">
-<parameter_description> a #PangoRenderer
+<parameter name="context">
+<parameter_description> a #PangoContext
</parameter_description>
</parameter>
</parameters>
-<return></return>
+<return> the global language tag.
+</return>
</function>
<function name="pango_parse_stretch">
@@ -8641,6 +8923,26 @@
</return>
</function>
+<function name="pango_layout_get_height">
+<description>
+Gets the height of layout used for ellipsization. See
+pango_layout_set_height() for details.
+
+
+</description>
+<parameters>
+<parameter name="layout">
+<parameter_description> a #PangoLayout
+</parameter_description>
+</parameter>
+</parameters>
+<return> the height, in Pango units if positive, or
+number of lines if negative.
+
+Since: 1.20
+</return>
+</function>
+
<function name="pango_layout_get_width">
<description>
Gets the width to which the lines of the #PangoLayout should wrap.
@@ -8653,7 +8955,7 @@
</parameter_description>
</parameter>
</parameters>
-<return> the width, or -1 if no width set.
+<return> the width in Pango units, or -1 if no width set.
</return>
</function>
@@ -8675,12 +8977,13 @@
</description>
<parameters>
<parameter name="language">
-<parameter_description> a string representing a language tag
+<parameter_description> a string representing a language tag, or %NULL
</parameter_description>
</parameter>
</parameters>
-<return> an opaque pointer to a #PangoLanguage structure.
-this will be valid forever after.
+<return> an opaque pointer to a #PangoLanguage structure, or %NULL
+if @language was %NULL. The returned pointer will be valid
+forever after, and should not be freed.
</return>
</function>
@@ -8758,31 +9061,22 @@
<return></return>
</function>
-<function name="pango_fc_font_description_from_pattern">
+<function name="pango_ft2_font_map_new">
<description>
-Creates a #PangoFontDescription that matches the specified
-Fontconfig pattern as closely as possible. Many possible Fontconfig
-pattern values, such as %FC_RASTERIZER or %FC_DPI, don't make sense in
-the context of #PangoFontDescription, so will be ignored.
+Create a new #PangoFT2FontMap object; a fontmap is used
+to cache information about available fonts, and holds
+certain global parameters such as the resolution and
+the default substitute function (see
+pango_ft2_font_map_set_default_substitute()).
</description>
<parameters>
-<parameter name="pattern">
-<parameter_description> a #FcPattern
-</parameter_description>
-</parameter>
-<parameter name="include_size">
-<parameter_description> if %TRUE, the pattern will include the size from
-the @pattern; otherwise the resulting pattern will be unsized.
-(only %FC_SIZE is examined, not %FC_PIXEL_SIZE)
-</parameter_description>
-</parameter>
</parameters>
-<return> a new #PangoFontDescription. Free with
-pango_font_description_free().
+<return> the newly created fontmap object. Unref
+with g_object_unref() when you are finished with it.
-Since: 1.4
+Since: 1.2
</return>
</function>
@@ -8872,7 +9166,7 @@
</description>
<parameters>
<parameter name="descs">
-<parameter_description> a pointer to an array of #PangoFontDescription, or %NULL
+<parameter_description> a pointer to an array of #PangoFontDescription, may be %NULL
</parameter_description>
</parameter>
<parameter name="n_descs">
@@ -8897,7 +9191,7 @@
</parameter_description>
</parameter>
</parameters>
-<return>a #GList of #PangoItem structures in visual order.
+<return> a #GList of #PangoItem structures in visual order.
(Please open a bug if you use this function.
It is not a particularly convenient interface, and the code
@@ -8931,54 +9225,32 @@
<parameter name="desc">
<parameter_description> a #PangoOTRulesetDescription.
</parameter_description>
-</parameter>
-</parameters>
-<return> the #PangoOTRuleset for @desc. This object will have
-the same lifetime as @info.
-
-Since: 1.18
-</return>
-</function>
-
-<function name="pango_glyph_string_index_to_x">
-<description>
-Converts from character position to x position. (X position
-is measured from the left edge of the run). Character positions
-are computed by dividing up each cluster into equal portions.
-
-</description>
-<parameters>
-<parameter name="glyphs">
-<parameter_description> the glyphs return from pango_shape()
-</parameter_description>
-</parameter>
-<parameter name="text">
-<parameter_description> the text for the run
-</parameter_description>
-</parameter>
-<parameter name="length">
-<parameter_description> the number of bytes (not characters) in @text.
-</parameter_description>
-</parameter>
-<parameter name="analysis">
-<parameter_description> the analysis information return from pango_itemize()
-</parameter_description>
-</parameter>
-<parameter name="index_">
-<parameter_description> the byte index within @text
-</parameter_description>
-</parameter>
-<parameter name="trailing">
-<parameter_description> whether we should compute the result for the beginning
-or end of the character.
-</parameter_description>
-</parameter>
-<parameter name="x_pos">
-<parameter_description> location to store result
+</parameter>
+</parameters>
+<return> the #PangoOTRuleset for @desc. This object will have
+the same lifetime as @info.
+
+Since: 1.18
+</return>
+</function>
+
+<function name="pango_ot_tag_to_language">
+<description>
+Finds a #PangoLanguage corresponding to @language_tag.
+
+
+</description>
+<parameters>
+<parameter name="language_tag">
+<parameter_description> A #PangoOTTag OpenType language-system tag
</parameter_description>
</parameter>
</parameters>
-<return></return>
+<return> #PangoLanguage best matching @language_tag or
+#PangoLanguage corresponding to the string "xx" if none found.
+
+Since: 1.18
+</return>
</function>
<function name="pango_matrix_transform_rectangle">
@@ -8996,8 +9268,9 @@
If you have the rectangle in Pango units and want to convert to
transformed pixel bounding box, it is more accurate to transform it first
(using this function) and pass the result to pango_extents_to_pixels(),
-as @ink_rect. However, there is a reason that you may want to convert
-to pixels first and then transform, and that is when the transformed
+first argument, for an inclusive rounded rectangle.
+However, there are valid reasons that you may want to convert
+to pixels first and then transform, for example when the transformed
coordinates may overflow in Pango units (large matrix translation for
example).
@@ -9025,7 +9298,7 @@
</description>
<parameters>
<parameter name="list">
-<parameter_description> a #PangoAttrList
+<parameter_description> a #PangoAttrList, may be %NULL
</parameter_description>
</parameter>
</parameters>
@@ -9035,51 +9308,60 @@
</return>
</function>
-<function name="pango_attr_list_insert">
+<function name="pango_break">
<description>
-Insert the given attribute into the #PangoAttrList. It will
-be inserted after all other attributes with a matching
- start_index
+Determines possible line, word, and character breaks
+for a string of Unicode text with a single analysis. For most
+purposes you may want to use pango_get_log_attrs().
</description>
<parameters>
-<parameter name="list">
-<parameter_description> a #PangoAttrList
+<parameter name="text">
+<parameter_description> the text to process
</parameter_description>
</parameter>
-<parameter name="attr">
-<parameter_description> the attribute to insert. Ownership of this value is
-assumed by the list.
+<parameter name="length">
+<parameter_description> length of @text in bytes (may be -1 if @text is nul-terminated)
+</parameter_description>
+</parameter>
+<parameter name="analysis">
+<parameter_description> #PangoAnalysis structure from pango_itemize()
+</parameter_description>
+</parameter>
+<parameter name="attrs">
+<parameter_description> an array to store character information in
+</parameter_description>
+</parameter>
+<parameter name="attrs_len">
+<parameter_description> size of the array passed as @attrs
</parameter_description>
</parameter>
</parameters>
<return></return>
</function>
-<function name="pango_win32_font_description_from_logfont">
+<function name="pango_attr_background_new">
<description>
-Creates a #PangoFontDescription that matches the specified LOGFONTA.
-
-The face name, italicness and weight fields in the LOGFONTA are used
-to set up the resulting #PangoFontDescription. If the face name in
-the LOGFONTA contains non-ASCII characters the font is temporarily
-loaded (using CreateFontIndirect()) and an ASCII (usually English)
-name for it is looked up from the font name tables in the font
-data. If that doesn't work, the face name is converted from the
-system codepage to UTF-8 and that is used.
+Create a new background color attribute.
</description>
<parameters>
-<parameter name="lfp">
-<parameter_description> a LOGFONTA
+<parameter name="red">
+<parameter_description> the red value (ranging from 0 to 65535)
+</parameter_description>
+</parameter>
+<parameter name="green">
+<parameter_description> the green value
+</parameter_description>
+</parameter>
+<parameter name="blue">
+<parameter_description> the blue value
</parameter_description>
</parameter>
</parameters>
-<return> the newly allocated #PangoFontDescription, which
-should be freed using pango_font_description_free()
-
-Since: 1.12
+<return> the newly allocated #PangoAttribute, which should be
+freed with pango_attribute_destroy().
</return>
</function>
@@ -9166,7 +9448,7 @@
</parameter_description>
</parameter>
</parameters>
-<return>a new #PangoFont.
+<return> a new #PangoFont.
</return>
</function>
@@ -9189,21 +9471,47 @@
</return>
</function>
-<function name="_pango_fc_font_set_decoder">
+<function name="pango_xft_render_transformed">
<description>
-This sets a custom decoder for this font. Any previous decoder
-will be released before this one is set.
+Renders a #PangoGlyphString onto a #XftDraw, possibly
+transforming the layed-out coordinates through a transformation
+matrix. Note that the transformation matrix for @font is not
+changed, so to produce correct rendering results, the @font
+must have been loaded using a #PangoContext with an identical
+transformation matrix to that passed in to this function.
-Since: 1.6
+Since: 1.8
</description>
<parameters>
+<parameter name="draw">
+<parameter_description> an #XftDraw
+</parameter_description>
+</parameter>
+<parameter name="color">
+<parameter_description> the color in which to draw the glyphs
+</parameter_description>
+</parameter>
<parameter name="font">
-<parameter_description> a #PangoFcFont
+<parameter_description> the font in which to draw the string
</parameter_description>
</parameter>
-<parameter name="decoder">
-<parameter_description> a #PangoFcDecoder to set for this font
+<parameter name="matrix">
+<parameter_description> a #PangoMatrix, or %NULL to use an identity transformation
+</parameter_description>
+</parameter>
+<parameter name="glyphs">
+<parameter_description> the glyph string to draw
+</parameter_description>
+</parameter>
+<parameter name="x">
+<parameter_description> the x position of the start of the string (in Pango
+units in user space coordinates)
+</parameter_description>
+</parameter>
+<parameter name="y">
+<parameter_description> the y position of the baseline (in Pango units
+in user space coordinates)
</parameter_description>
</parameter>
</parameters>
@@ -9271,17 +9579,16 @@
<description>
Copy @list and return an identical new list.
+Returns %NULL if @list was %NULL.
</description>
<parameters>
<parameter name="list">
-<parameter_description> a #PangoAttrList
+<parameter_description> a #PangoAttrList, may be %NULL
</parameter_description>
</parameter>
</parameters>
-<return> the newly allocated #PangoAttrList, with a
-reference count of one, which should
-be freed with pango_attr_list_unref().
+<return>%NULL if @list was %NULL.
</return>
</function>
@@ -9346,6 +9653,22 @@
<return></return>
</function>
+<function name="pango_ot_buffer_clear">
+<description>
+Empties a #PangoOTBuffer, make it ready to add glyphs to.
+
+Since: 1.4
+
+</description>
+<parameters>
+<parameter name="buffer">
+<parameter_description> a #PangoOTBuffer
+</parameter_description>
+</parameter>
+</parameters>
+<return></return>
+</function>
+
<function name="pango_fc_font_kern_glyphs">
<description>
Adjust each adjacent pair of glyphs in @glyphs according to
@@ -9367,30 +9690,27 @@
<return></return>
</function>
-<function name="pango_layout_line_get_extents">
+<function name="pango_bidi_type_for_unichar">
<description>
-Computes the logical and ink extents of a layout line. See
-pango_font_get_glyph_extents() for details about the interpretation
-of the rectangles.
+Determines the normative bidirectional character type of a
+character, as specified in the Unicode Character Database.
+
+A simplified version of this function is available as
+pango_unichar_get_direction().
+
</description>
<parameters>
-<parameter name="line">
-<parameter_description> a #PangoLayoutLine
-</parameter_description>
-</parameter>
-<parameter name="ink_rect">
-<parameter_description> rectangle used to store the extents of the glyph string
-as drawn, or %NULL
-</parameter_description>
-</parameter>
-<parameter name="logical_rect">
-<parameter_description> rectangle used to store the logical extents of the glyph
-string, or %NULL
+<parameter name="ch">
+<parameter_description> a Unicode character
</parameter_description>
</parameter>
</parameters>
-<return></return>
+<return> the bidirectional character type, as used in the
+Unicode bidirectional algorithm.
+
+Since: 1.22
+</return>
</function>
<function name="pango_x_font_get_unknown_glyph">
@@ -9568,7 +9888,7 @@
</description>
<parameters>
<parameter name="desc">
-<parameter_description> a #PangoFontDescription, or %NULL
+<parameter_description> a #PangoFontDescription, may be %NULL
</parameter_description>
</parameter>
</parameters>
@@ -10014,28 +10334,25 @@
</return>
</function>
-<function name="pango_ot_buffer_set_zero_width_marks">
+<function name="_pango_cairo_font_install">
<description>
-Sets whether characters with a mark class should be forced to zero width.
-This setting is needed for proper positioning of Arabic accents,
-but will produce incorrect results with standard OpenType Indic
-fonts.
+Makes @font the current font for rendering in the specified
+Cairo context.
-Since: 1.6
</description>
<parameters>
-<parameter name="buffer">
-<parameter_description> a #PangoOTBuffer
+<parameter name="font">
+<parameter_description> a #PangoCairoFont
</parameter_description>
</parameter>
-<parameter name="zero_width_marks">
-<parameter_description> %TRUE if characters with a mark class should
-be forced to zero width.
+<parameter name="cr">
+<parameter_description> a #cairo_t
</parameter_description>
</parameter>
</parameters>
-<return></return>
+<return> %TRUE if font was installed successfully, %FALSE otherwise.
+</return>
</function>
<function name="pango_language_get_default">
@@ -10077,28 +10394,29 @@
<return></return>
</function>
-<function name="pango_attr_iterator_get">
+<function name="pango_get_mirror_char">
<description>
-Find the current attribute of a particular type at the iterator
-location. When multiple attributes of the same type overlap,
-the attribute whose range starts closest to the current location
-is used.
+If @ch has the Unicode mirrored property and there is another Unicode
+character that typically has a glyph that is the mirror image of @ch's
+glyph, puts that character in the address pointed to by @mirrored_ch.
+
+Use g_unichar_get_mirror_char() instead; the docs for that function
+provide full details.
</description>
<parameters>
-<parameter name="iterator">
-<parameter_description> a #PangoAttrIterator
+<parameter name="ch">
+<parameter_description> a Unicode character
</parameter_description>
</parameter>
-<parameter name="type">
-<parameter_description> the type of attribute to find.
+<parameter name="mirrored_ch">
+<parameter_description> location to store the mirrored character
</parameter_description>
</parameter>
</parameters>
-<return> the current attribute of the given type, or %NULL
-if no attribute of that type applies to the current
-location.
+<return> %TRUE if @ch has a mirrored character and @mirrored_ch is
+filled in, %FALSE otherwise
</return>
</function>
@@ -10163,7 +10481,7 @@
<function name="pango_xft_font_get_font">
<description>
-Return value: the XftFont associated to @font.
+Return value: the XftFont associated to @font, or %NULL if @font is %NULL.
</description>
<parameters>
@@ -10172,7 +10490,7 @@
</parameter_description>
</parameter>
</parameters>
-<return> the XftFont associated to @font.
+<return> the XftFont associated to @font, or %NULL if @font is %NULL.
</return>
</function>
@@ -10206,25 +10524,28 @@
</return>
</function>
-<function name="pango_layout_get_font_description">
+<function name="pango_layout_set_indent">
<description>
-Gets the font description for the layout, if any.
+Sets the width in Pango units to indent each paragraph. A negative value
+of @indent will produce a hanging indentation. That is, the first line will
+have the full width, and subsequent lines will be indented by the
+absolute value of @indent.
+The indent setting is ignored if layout alignment is set to
+%PANGO_ALIGN_CENTER.
</description>
<parameters>
<parameter name="layout">
-<parameter_description> a #PangoLayout
+<parameter_description> a #PangoLayout.
+</parameter_description>
+</parameter>
+<parameter name="indent">
+<parameter_description> the amount by which to indent.
</parameter_description>
</parameter>
</parameters>
-<return> a pointer to the layout's font description,
-or %NULL if the font description from the layout's
-context is inherited. This value is owned by the layout
-and must not be modified or freed.
-
-Since: 1.8
-</return>
+<return></return>
</function>
<function name="pango_attr_variant_new">
@@ -10265,7 +10586,7 @@
</parameter_description>
</parameter>
<parameter name="x_pos">
-<parameter_description> the X offset (in #PangoGlyphUnit)
+<parameter_description> the X offset (in Pango units)
from the left edge of the line.
</parameter_description>
</parameter>
@@ -10275,10 +10596,10 @@
</parameter_description>
</parameter>
<parameter name="trailing">
-<parameter_description> location to store a integer indicating where
+<parameter_description> location to store an integer indicating where
in the grapheme the user clicked. It will either
be zero, or the number of characters in the
-grapheme. 0 represents the trailing edge of the grapheme.
+grapheme. 0 represents the leading edge of the grapheme.
</parameter_description>
</parameter>
</parameters>
@@ -10294,7 +10615,7 @@
</description>
<parameters>
<parameter name="matrix">
-<parameter_description> a #PangoMatrix, can be %NULL
+<parameter_description> a #PangoMatrix, may be %NULL
</parameter_description>
</parameter>
</parameters>
@@ -10306,16 +10627,26 @@
</return>
</function>
-<function name="pango_layout_line_unref">
+<function name="pango_attr_iterator_range">
<description>
-Decrease the reference count of a #PangoLayoutLine by one.
-If the result is zero, the line and all associated memory
-will be freed.
+Get the range of the current segment. Note that the
+stored return values are signed, not unsigned like
+the values in #PangoAttribute. To deal with this API
+oversight, stored return values that wouldn't fit into
+a signed integer are clamped to %G_MAXINT.
</description>
<parameters>
-<parameter name="line">
-<parameter_description> a #PangoLayoutLine
+<parameter name="iterator">
+<parameter_description> a #PangoAttrIterator
+</parameter_description>
+</parameter>
+<parameter name="start">
+<parameter_description> location to store the start of the range
+</parameter_description>
+</parameter>
+<parameter name="end">
+<parameter_description> location to store the end of the range
</parameter_description>
</parameter>
</parameters>
@@ -10400,23 +10731,18 @@
<return></return>
</function>
-<function name="pango_version_string">
+<function name="pango_attribute_destroy">
<description>
-This is similar to the macro %PANGO_VERSION_STRING except that
-it returns the version of Pango available at run-time, as opposed to
-the version available at compile-time.
-
+Destroy a #PangoAttribute and free all associated memory.
</description>
<parameters>
+<parameter name="attr">
+<parameter_description> a #PangoAttribute.
+</parameter_description>
+</parameter>
</parameters>
-<return>value: A string containing the version of Pango library
-available at run time.
-The returned string is owned by Pango and should not be modified
-or freed.
-
-Since: 1.16
-</return>
+<return></return>
</function>
<function name="pango_glyph_string_new">
@@ -10432,25 +10758,6 @@
</return>
</function>
-<function name="_pango_xft_font_get_mini_font">
-<description>
-Gets the font used for drawing the digits in the
-missing-character hex squares
-
-
-</description>
-<parameters>
-<parameter name="xfont">
-<parameter_description> a #PangoXftFont
-</parameter_description>
-</parameter>
-</parameters>
-<return> the #PangoFont used for the digits; this
-value is associated with the main font and will be freed
-along with the main font.
-</return>
-</function>
-
<function name="pango_layout_get_log_attrs">
<description>
Retrieves an array of logical attributes for each character in
@@ -10486,13 +10793,39 @@
</description>
<parameters>
<parameter name="string">
-<parameter_description> a #PangoGlyphString.
+<parameter_description> a #PangoGlyphString, may be %NULL
</parameter_description>
</parameter>
</parameters>
<return></return>
</function>
+<function name="pango_find_map">
+<description>
+Locate a #PangoMap for a particular engine type and render
+type. The resulting map can be used to determine the engine
+for each character.
+
+
+</description>
+<parameters>
+<parameter name="language">
+<parameter_description> the language tag for which to find the map
+</parameter_description>
+</parameter>
+<parameter name="engine_type_id">
+<parameter_description> the engine type for the map to find
+</parameter_description>
+</parameter>
+<parameter name="render_type_id">
+<parameter_description> the render type for the map to find
+</parameter_description>
+</parameter>
+</parameters>
+<return> the suitable #PangoMap.
+</return>
+</function>
+
<function name="_pango_layout_line_ellipsize">
<description>
Given a #PangoLayoutLine with the runs still in logical order, ellipsize
@@ -10606,6 +10939,22 @@
</return>
</function>
+<function name="pango_attr_list_unref">
+<description>
+Decrease the reference count of the given attribute list by one.
+If the result is zero, free the attribute list and the attributes
+it contains.
+
+</description>
+<parameters>
+<parameter name="list">
+<parameter_description> a #PangoAttrList, may be %NULL
+</parameter_description>
+</parameter>
+</parameters>
+<return></return>
+</function>
+
<function name="pango_font_metrics_ref">
<description>
Increase the reference count of a font metrics structure by one.
@@ -10614,7 +10963,7 @@
</description>
<parameters>
<parameter name="metrics">
-<parameter_description> a #PangoFontMetrics structure
+<parameter_description> a #PangoFontMetrics structure, may be %NULL
</parameter_description>
</parameter>
</parameters>
@@ -10812,7 +11161,7 @@
with each range starting at &lt;literal&gt;(*ranges)[2*n]&lt;/literal&gt;
and of width &lt;literal&gt;(*ranges)[2*n + 1] - (*ranges)[2*n]&lt;/literal&gt;.
This array must be freed with g_free(). The coordinates are relative
-to the layout and are in #PangoGlyphUnit.
+to the layout and are in Pango units.
</parameter_description>
</parameter>
<parameter name="n_ranges">
@@ -10881,13 +11230,30 @@
</description>
<parameters>
<parameter name="metrics">
-<parameter_description> a #PangoFontMetrics structure
+<parameter_description> a #PangoFontMetrics structure, may be %NULL
</parameter_description>
</parameter>
</parameters>
<return></return>
</function>
+<function name="pango_attr_family_new">
+<description>
+Create a new font family attribute.
+
+
+</description>
+<parameters>
+<parameter name="family">
+<parameter_description> the family or comma separated list of families
+</parameter_description>
+</parameter>
+</parameters>
+<return> the newly allocated #PangoAttribute, which should be
+freed with pango_attribute_destroy().
+</return>
+</function>
+
<function name="pango_xft_render_layout_line">
<description>
Render a #PangoLayoutLine onto a #XftDraw
@@ -10921,30 +11287,25 @@
<return></return>
</function>
-<function name="pango_win32_font_description_from_logfontw">
+<function name="pango_font_metrics_get_underline_position">
<description>
-Creates a #PangoFontDescription that matches the specified LOGFONTW.
-
-The face name, italicness and weight fields in the LOGFONTW are used
-to set up the resulting #PangoFontDescription. If the face name in
-the LOGFONTW contains non-ASCII characters the font is temporarily
-loaded (using CreateFontIndirect()) and an ASCII (usually English)
-name for it is looked up from the font name tables in the font
-data. If that doesn't work, the face name is converted from UTF-16
-to UTF-8 and that is used.
+Gets the suggested position to draw the underline.
+The value returned is the distance &lt;emphasis&gt;above&lt;/emphasis&gt; the
+baseline of the top of the underline. Since most fonts have
+underline positions beneath the baseline, this value is typically
+negative.
</description>
<parameters>
-<parameter name="lfp">
-<parameter_description> a LOGFONTW
+<parameter name="metrics">
+<parameter_description> a #PangoFontMetrics structure
</parameter_description>
</parameter>
</parameters>
-<return> the newly allocated #PangoFontDescription, which
-should be freed using pango_font_description_free()
+<return> the suggested underline position, in Pango units.
-Since: 1.16
+Since: 1.6
</return>
</function>
@@ -10980,12 +11341,13 @@
</description>
<parameters>
<parameter name="desc">
-<parameter_description> a #PangoFontDescription
+<parameter_description> a #PangoFontDescription, may be %NULL
</parameter_description>
</parameter>
</parameters>
<return> the newly allocated #PangoFontDescription, which should
-be freed with pango_font_description_free().
+be freed with pango_font_description_free(), or %NULL
+if @desc was %NULL.
</return>
</function>
@@ -11040,7 +11402,7 @@
</parameter_description>
</parameter>
</parameters>
-<return> the #PangoFontMap for the font
+<return> the #PangoFontMap for the font, or %NULL if @font is %NULL.
Since: 1.10
</return>
@@ -11131,6 +11493,30 @@
</return>
</function>
+<function name="pango_layout_iter_get_cluster_extents">
+<description>
+Gets the extents of the current cluster, in layout coordinates
+(origin is the top left of the entire layout).
+
+
+</description>
+<parameters>
+<parameter name="iter">
+<parameter_description> a #PangoLayoutIter
+</parameter_description>
+</parameter>
+<parameter name="ink_rect">
+<parameter_description> rectangle to fill with ink extents, or %NULL
+</parameter_description>
+</parameter>
+<parameter name="logical_rect">
+<parameter_description> rectangle to fill with logical extents, or %NULL
+</parameter_description>
+</parameter>
+</parameters>
+<return></return>
+</function>
+
<function name="pango_attr_strikethrough_new">
<description>
Create a new strike-through attribute.
@@ -11156,12 +11542,13 @@
</description>
<parameters>
<parameter name="string">
-<parameter_description> a #PangoGlyphString.
+<parameter_description> a #PangoGlyphString, may be %NULL
</parameter_description>
</parameter>
</parameters>
<return> the newly allocated #PangoGlyphString, which
-should be freed with pango_glyph_string_free().
+should be freed with pango_glyph_string_free(),
+or %NULL if @string was %NULL.
</return>
</function>
@@ -11274,47 +11661,22 @@
<return></return>
</function>
-<function name="pango_xft_render_transformed">
+<function name="pango_cairo_show_layout">
<description>
-Renders a #PangoGlyphString onto a #XftDraw, possibly
-transforming the layed-out coordinates through a transformation
-matrix. Note that the transformation matrix for @font is not
-changed, so to produce correct rendering results, the @font
-must have been loaded using a #PangoContext with an identical
-transformation matrix to that passed in to this function.
+Draws a #PangoLayoutLine in the specified cairo context.
+The top-left corner of the #PangoLayout will be drawn
+at the current point of the cairo context.
-Since: 1.8
+Since: 1.10
</description>
<parameters>
-<parameter name="draw">
-<parameter_description> an #XftDraw
-</parameter_description>
-</parameter>
-<parameter name="color">
-<parameter_description> the color in which to draw the glyphs
-</parameter_description>
-</parameter>
-<parameter name="font">
-<parameter_description> the font in which to draw the string
-</parameter_description>
-</parameter>
-<parameter name="matrix">
-<parameter_description> a #PangoMatrix, or %NULL to use an identity transformation
-</parameter_description>
-</parameter>
-<parameter name="glyphs">
-<parameter_description> the glyph string to draw
-</parameter_description>
-</parameter>
-<parameter name="x">
-<parameter_description> the x position of the start of the string (in Pango
-units in user space coordinates)
+<parameter name="cr">
+<parameter_description> a Cairo context
</parameter_description>
</parameter>
-<parameter name="y">
-<parameter_description> the y position of the baseline (in Pango units
-in user space coordinates)
+<parameter name="layout">
+<parameter_description> a Pango layout
</parameter_description>
</parameter>
</parameters>
@@ -11328,7 +11690,6 @@
and display a glyph for paragraph separator characters. Used when
you want to allow editing of newlines on a single text line.
-
</description>
<parameters>
<parameter name="layout">
@@ -11471,6 +11832,24 @@
</return>
</function>
+<function name="pango_layout_iter_get_layout">
+<description>
+Gets the layout associated with a #PangoLayoutIter.
+
+
+</description>
+<parameters>
+<parameter name="iter">
+<parameter_description> a #PangoLayoutIter
+</parameter_description>
+</parameter>
+</parameters>
+<return> the layout associated with @iter.
+
+Since: 1.20
+</return>
+</function>
+
<function name="pango_ot_tag_from_script">
<description>
Finds the OpenType script tag corresponding to @script.
@@ -11580,25 +11959,30 @@
</return>
</function>
-<function name="pango_font_metrics_get_underline_position">
+<function name="pango_win32_font_description_from_logfontw">
<description>
-Gets the suggested position to draw the underline.
-The value returned is the distance &lt;emphasis&gt;above&lt;/emphasis&gt; the
-baseline of the top of the underline. Since most fonts have
-underline positions beneath the baseline, this value is typically
-negative.
+Creates a #PangoFontDescription that matches the specified LOGFONTW.
+
+The face name, italicness and weight fields in the LOGFONTW are used
+to set up the resulting #PangoFontDescription. If the face name in
+the LOGFONTW contains non-ASCII characters the font is temporarily
+loaded (using CreateFontIndirect()) and an ASCII (usually English)
+name for it is looked up from the font name tables in the font
+data. If that doesn't work, the face name is converted from UTF-16
+to UTF-8 and that is used.
</description>
<parameters>
-<parameter name="metrics">
-<parameter_description> a #PangoFontMetrics structure
+<parameter name="lfp">
+<parameter_description> a LOGFONTW
</parameter_description>
</parameter>
</parameters>
-<return> the suggested underline position, in Pango units.
+<return> the newly allocated #PangoFontDescription, which
+should be freed using pango_font_description_free()
-Since: 1.6
+Since: 1.16
</return>
</function>
@@ -11654,28 +12038,20 @@
</return>
</function>
-<function name="pango_context_load_fontset">
+<function name="pango_font_describe_with_absolute_size">
<description>
-Load a set of fonts in the context that can be used to render
-a font matching @desc.
-
+Return value: a newly-allocated #PangoFontDescription object.
</description>
<parameters>
-<parameter name="context">
-<parameter_description> a #PangoContext
-</parameter_description>
-</parameter>
-<parameter name="desc">
-<parameter_description> a #PangoFontDescription describing the fonts to load
-</parameter_description>
-</parameter>
-<parameter name="language">
-<parameter_description> a #PangoLanguage the fonts will be used for
+<parameter name="font">
+<parameter_description> a #PangoFont
</parameter_description>
</parameter>
</parameters>
-<return>the fontset, or %NULL if no font matched.
+<return> a newly-allocated #PangoFontDescription object.
+
+Since: 1.14
</return>
</function>
Modified: trunk/pango/src/pango_enums.defs
==============================================================================
--- trunk/pango/src/pango_enums.defs (original)
+++ trunk/pango/src/pango_enums.defs Sun Jul 27 10:11:07 2008
@@ -1,4 +1,4 @@
-;; From /home/murrayc/svn/gnome218/pango/pango/pango-attributes.h
+;; From /home/murrayc/svn/gnome220/pango/pango/pango-attributes.h
(define-enum-extended AttrType
(in-module "Pango")
@@ -42,7 +42,49 @@
)
)
-;; From /home/murrayc/svn/gnome218/pango/pango/pango-coverage.h
+;; From /home/murrayc/svn/gnome220/pango/pango/pango-bidi-type.h
+
+(define-enum-extended BidiType
+ (in-module "Pango")
+ (c-name "PangoBidiType")
+ (values
+ '("l" "PANGO_BIDI_TYPE_L" "0")
+ '("lre" "PANGO_BIDI_TYPE_LRE" "1")
+ '("lro" "PANGO_BIDI_TYPE_LRO" "2")
+ '("r" "PANGO_BIDI_TYPE_R" "3")
+ '("al" "PANGO_BIDI_TYPE_AL" "4")
+ '("rle" "PANGO_BIDI_TYPE_RLE" "5")
+ '("rlo" "PANGO_BIDI_TYPE_RLO" "6")
+ '("pdf" "PANGO_BIDI_TYPE_PDF" "7")
+ '("en" "PANGO_BIDI_TYPE_EN" "8")
+ '("es" "PANGO_BIDI_TYPE_ES" "9")
+ '("et" "PANGO_BIDI_TYPE_ET" "10")
+ '("an" "PANGO_BIDI_TYPE_AN" "11")
+ '("cs" "PANGO_BIDI_TYPE_CS" "12")
+ '("nsm" "PANGO_BIDI_TYPE_NSM" "13")
+ '("bn" "PANGO_BIDI_TYPE_BN" "14")
+ '("b" "PANGO_BIDI_TYPE_B" "15")
+ '("s" "PANGO_BIDI_TYPE_S" "16")
+ '("ws" "PANGO_BIDI_TYPE_WS" "17")
+ '("on" "PANGO_BIDI_TYPE_ON" "18")
+ )
+)
+
+(define-enum-extended Direction
+ (in-module "Pango")
+ (c-name "PangoDirection")
+ (values
+ '("ltr" "PANGO_DIRECTION_LTR" "0")
+ '("rtl" "PANGO_DIRECTION_RTL" "1")
+ '("ttb-ltr" "PANGO_DIRECTION_TTB_LTR" "2")
+ '("ttb-rtl" "PANGO_DIRECTION_TTB_RTL" "3")
+ '("weak-ltr" "PANGO_DIRECTION_WEAK_LTR" "4")
+ '("weak-rtl" "PANGO_DIRECTION_WEAK_RTL" "5")
+ '("neutral" "PANGO_DIRECTION_NEUTRAL" "6")
+ )
+)
+
+;; From /home/murrayc/svn/gnome220/pango/pango/pango-coverage.h
(define-enum-extended CoverageLevel
(in-module "Pango")
@@ -55,7 +97,7 @@
)
)
-;; From /home/murrayc/svn/gnome218/pango/pango/pango-font.h
+;; From /home/murrayc/svn/gnome220/pango/pango/pango-font.h
(define-enum-extended Style
(in-module "Pango")
@@ -120,7 +162,7 @@
)
)
-;; From /home/murrayc/svn/gnome218/pango/pango/pango-gravity.h
+;; From /home/murrayc/svn/gnome220/pango/pango/pango-gravity.h
(define-enum-extended Gravity
(in-module "Pango")
@@ -144,7 +186,7 @@
)
)
-;; From /home/murrayc/svn/gnome218/pango/pango/pango-layout.h
+;; From /home/murrayc/svn/gnome220/pango/pango/pango-layout.h
(define-enum-extended Alignment
(in-module "Pango")
@@ -177,7 +219,7 @@
)
)
-;; From /home/murrayc/svn/gnome218/pango/pango/pango-ot.h
+;; From /home/murrayc/svn/gnome220/pango/pango/pango-ot.h
(define-enum-extended OTTableType
(in-module "Pango")
@@ -188,7 +230,7 @@
)
)
-;; From /home/murrayc/svn/gnome218/pango/pango/pango-renderer.h
+;; From /home/murrayc/svn/gnome220/pango/pango/pango-renderer.h
(define-enum-extended RenderPart
(in-module "Pango")
@@ -201,7 +243,7 @@
)
)
-;; From /home/murrayc/svn/gnome218/pango/pango/pango-script.h
+;; From /home/murrayc/svn/gnome220/pango/pango/pango-script.h
(define-enum-extended Script
(in-module "Pango")
@@ -275,10 +317,21 @@
'("phoenician" "PANGO_SCRIPT_PHOENICIAN" "64")
'("phags-pa" "PANGO_SCRIPT_PHAGS_PA" "65")
'("nko" "PANGO_SCRIPT_NKO" "66")
+ '("kayah-li" "PANGO_SCRIPT_KAYAH_LI" "67")
+ '("lepcha" "PANGO_SCRIPT_LEPCHA" "68")
+ '("rejang" "PANGO_SCRIPT_REJANG" "69")
+ '("sundanese" "PANGO_SCRIPT_SUNDANESE" "70")
+ '("saurashtra" "PANGO_SCRIPT_SAURASHTRA" "71")
+ '("cham" "PANGO_SCRIPT_CHAM" "72")
+ '("ol-chiki" "PANGO_SCRIPT_OL_CHIKI" "73")
+ '("vai" "PANGO_SCRIPT_VAI" "74")
+ '("carian" "PANGO_SCRIPT_CARIAN" "75")
+ '("lycian" "PANGO_SCRIPT_LYCIAN" "76")
+ '("lydian" "PANGO_SCRIPT_LYDIAN" "77")
)
)
-;; From /home/murrayc/svn/gnome218/pango/pango/pango-tabs.h
+;; From /home/murrayc/svn/gnome220/pango/pango/pango-tabs.h
(define-enum-extended TabAlign
(in-module "Pango")
@@ -288,23 +341,7 @@
)
)
-;; From /home/murrayc/svn/gnome218/pango/pango/pango-types.h
-
-(define-enum-extended Direction
- (in-module "Pango")
- (c-name "PangoDirection")
- (values
- '("ltr" "PANGO_DIRECTION_LTR" "0")
- '("rtl" "PANGO_DIRECTION_RTL" "1")
- '("ttb-ltr" "PANGO_DIRECTION_TTB_LTR" "2")
- '("ttb-rtl" "PANGO_DIRECTION_TTB_RTL" "3")
- '("weak-ltr" "PANGO_DIRECTION_WEAK_LTR" "4")
- '("weak-rtl" "PANGO_DIRECTION_WEAK_RTL" "5")
- '("neutral" "PANGO_DIRECTION_NEUTRAL" "6")
- )
-)
-
-;; From /home/murrayc/svn/gnome218/pango/pango/pangowin32-private.h
+;; From /home/murrayc/svn/gnome220/pango/pango/pangowin32-private.h
(define-enum-extended Win32CoverageLanguageClass
(in-module "Pango")
Modified: trunk/pango/src/pango_methods.defs
==============================================================================
--- trunk/pango/src/pango_methods.defs (original)
+++ trunk/pango/src/pango_methods.defs Sun Jul 27 10:11:07 2008
@@ -191,6 +191,48 @@
)
)
+(define-enum BidiType
+ (in-module "Pango")
+ (c-name "PangoBidiType")
+ (gtype-id "PANGO_TYPE_BIDI_TYPE")
+ (values
+ '("l" "PANGO_BIDI_TYPE_L")
+ '("lre" "PANGO_BIDI_TYPE_LRE")
+ '("lro" "PANGO_BIDI_TYPE_LRO")
+ '("r" "PANGO_BIDI_TYPE_R")
+ '("al" "PANGO_BIDI_TYPE_AL")
+ '("rle" "PANGO_BIDI_TYPE_RLE")
+ '("rlo" "PANGO_BIDI_TYPE_RLO")
+ '("pdf" "PANGO_BIDI_TYPE_PDF")
+ '("en" "PANGO_BIDI_TYPE_EN")
+ '("es" "PANGO_BIDI_TYPE_ES")
+ '("et" "PANGO_BIDI_TYPE_ET")
+ '("an" "PANGO_BIDI_TYPE_AN")
+ '("cs" "PANGO_BIDI_TYPE_CS")
+ '("nsm" "PANGO_BIDI_TYPE_NSM")
+ '("bn" "PANGO_BIDI_TYPE_BN")
+ '("b" "PANGO_BIDI_TYPE_B")
+ '("s" "PANGO_BIDI_TYPE_S")
+ '("ws" "PANGO_BIDI_TYPE_WS")
+ '("on" "PANGO_BIDI_TYPE_ON")
+ )
+)
+
+(define-enum Direction
+ (in-module "Pango")
+ (c-name "PangoDirection")
+ (gtype-id "PANGO_TYPE_DIRECTION")
+ (values
+ '("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 CoverageLevel
(in-module "Pango")
(c-name "PangoCoverageLevel")
@@ -424,6 +466,17 @@
'("phoenician" "PANGO_SCRIPT_PHOENICIAN")
'("phags-pa" "PANGO_SCRIPT_PHAGS_PA")
'("nko" "PANGO_SCRIPT_NKO")
+ '("kayah-li" "PANGO_SCRIPT_KAYAH_LI")
+ '("lepcha" "PANGO_SCRIPT_LEPCHA")
+ '("rejang" "PANGO_SCRIPT_REJANG")
+ '("sundanese" "PANGO_SCRIPT_SUNDANESE")
+ '("saurashtra" "PANGO_SCRIPT_SAURASHTRA")
+ '("cham" "PANGO_SCRIPT_CHAM")
+ '("ol-chiki" "PANGO_SCRIPT_OL_CHIKI")
+ '("vai" "PANGO_SCRIPT_VAI")
+ '("carian" "PANGO_SCRIPT_CARIAN")
+ '("lycian" "PANGO_SCRIPT_LYCIAN")
+ '("lydian" "PANGO_SCRIPT_LYDIAN")
)
)
@@ -436,29 +489,6 @@
)
)
-(define-enum Direction
- (in-module "Pango")
- (c-name "PangoDirection")
- (gtype-id "PANGO_TYPE_DIRECTION")
- (values
- '("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")
- )
-)
-
-
-;; From module-defs.h
-
-
-
-;; From modules.h
-
-
;; From pangoatsui.h
@@ -526,6 +556,21 @@
)
)
+(define-method get_name
+ (of-object "PangoAttrType")
+ (c-name "pango_attr_type_get_name")
+ (return-type "const-char*")
+)
+
+(define-method init
+ (of-object "PangoAttribute")
+ (c-name "pango_attribute_init")
+ (return-type "none")
+ (parameters
+ '("const-PangoAttrClass*" "klass")
+ )
+)
+
(define-method copy
(of-object "PangoAttribute")
(c-name "pango_attribute_copy")
@@ -918,6 +963,44 @@
+;; From pango-bidi-type.h
+
+(define-function pango_bidi_type_for_unichar
+ (c-name "pango_bidi_type_for_unichar")
+ (return-type "PangoBidiType")
+ (parameters
+ '("gunichar" "ch")
+ )
+)
+
+(define-function pango_unichar_direction
+ (c-name "pango_unichar_direction")
+ (return-type "PangoDirection")
+ (parameters
+ '("gunichar" "ch")
+ )
+)
+
+(define-function pango_find_base_dir
+ (c-name "pango_find_base_dir")
+ (return-type "PangoDirection")
+ (parameters
+ '("const-gchar*" "text")
+ '("gint" "length")
+ )
+)
+
+(define-function pango_get_mirror_char
+ (c-name "pango_get_mirror_char")
+ (return-type "gboolean")
+ (parameters
+ '("gunichar" "ch")
+ '("gunichar*" "mirrored_ch")
+ )
+)
+
+
+
;; From pango-break.h
(define-function pango_break
@@ -1023,6 +1106,12 @@
(return-type "PangoFontMap*")
)
+(define-method set_default
+ (of-object "PangoCairoFontMap")
+ (c-name "pango_cairo_font_map_set_default")
+ (return-type "none")
+)
+
(define-method get_font_type
(of-object "PangoCairoFontMap")
(c-name "pango_cairo_font_map_get_font_type")
@@ -1124,6 +1213,14 @@
)
)
+(define-function pango_cairo_create_context
+ (c-name "pango_cairo_create_context")
+ (return-type "PangoContext*")
+ (parameters
+ '("cairo_t*" "cr")
+ )
+)
+
(define-function pango_cairo_create_layout
(c-name "pango_cairo_create_layout")
(return-type "PangoLayout*")
@@ -1577,6 +1674,16 @@
(return-type "GType")
)
+(define-function pango_bidi_type_get_type
+ (c-name "pango_bidi_type_get_type")
+ (return-type "GType")
+)
+
+(define-function pango_direction_get_type
+ (c-name "pango_direction_get_type")
+ (return-type "GType")
+)
+
(define-function pango_coverage_level_get_type
(c-name "pango_coverage_level_get_type")
(return-type "GType")
@@ -1647,11 +1754,6 @@
(return-type "GType")
)
-(define-function pango_direction_get_type
- (c-name "pango_direction_get_type")
- (return-type "GType")
-)
-
;; From pangofc-decoder.h
@@ -1747,12 +1849,6 @@
(return-type "PangoContext*")
)
-(define-method cache_clear
- (of-object "PangoFcFontMap")
- (c-name "pango_fc_font_map_cache_clear")
- (return-type "none")
-)
-
(define-method shutdown
(of-object "PangoFcFontMap")
(c-name "pango_fc_font_map_shutdown")
@@ -1764,6 +1860,12 @@
(return-type "GType")
)
+(define-method cache_clear
+ (of-object "PangoFcFontMap")
+ (c-name "pango_fc_font_map_cache_clear")
+ (return-type "none")
+)
+
(define-method add_decoder_find_func
(of-object "PangoFcFontMap")
(c-name "pango_fc_font_map_add_decoder_find_func")
@@ -2680,6 +2782,11 @@
;; From pango-glyph-item.h
+(define-function pango_glyph_item_get_type
+ (c-name "pango_glyph_item_get_type")
+ (return-type "GType")
+)
+
(define-method split
(of-object "PangoGlyphItem")
(c-name "pango_glyph_item_split")
@@ -2690,6 +2797,12 @@
)
)
+(define-method copy
+ (of-object "PangoGlyphItem")
+ (c-name "pango_glyph_item_copy")
+ (return-type "PangoGlyphItem*")
+)
+
(define-method free
(of-object "PangoGlyphItem")
(c-name "pango_glyph_item_free")
@@ -2811,6 +2924,12 @@
)
)
+(define-method to_string
+ (of-object "PangoLanguage")
+ (c-name "pango_language_to_string")
+ (return-type "const-char*")
+)
+
(define-method get_sample_string
(of-object "PangoLanguage")
(c-name "pango_language_get_sample_string")
@@ -2944,6 +3063,21 @@
(return-type "int")
)
+(define-method set_height
+ (of-object "PangoLayout")
+ (c-name "pango_layout_set_height")
+ (return-type "none")
+ (parameters
+ '("int" "height")
+ )
+)
+
+(define-method get_height
+ (of-object "PangoLayout")
+ (c-name "pango_layout_get_height")
+ (return-type "int")
+)
+
(define-method set_wrap
(of-object "PangoLayout")
(c-name "pango_layout_set_wrap")
@@ -3212,6 +3346,12 @@
)
)
+(define-method get_baseline
+ (of-object "PangoLayout")
+ (c-name "pango_layout_get_baseline")
+ (return-type "int")
+)
+
(define-method get_line_count
(of-object "PangoLayout")
(c-name "pango_layout_get_line_count")
@@ -3330,6 +3470,12 @@
(return-type "PangoLayoutIter*")
)
+(define-method copy
+ (of-object "PangoLayoutIter")
+ (c-name "pango_layout_iter_copy")
+ (return-type "PangoLayoutIter*")
+)
+
(define-method free
(of-object "PangoLayoutIter")
(c-name "pango_layout_iter_free")
@@ -3372,6 +3518,12 @@
(return-type "gboolean")
)
+(define-method get_layout
+ (of-object "PangoLayoutIter")
+ (c-name "pango_layout_iter_get_layout")
+ (return-type "PangoLayout*")
+)
+
(define-method next_char
(of-object "PangoLayoutIter")
(c-name "pango_layout_iter_next_char")
@@ -3614,6 +3766,16 @@
;; From pango-ot.h
+(define-function pango_ot_info_get_type
+ (c-name "pango_ot_info_get_type")
+ (return-type "GType")
+)
+
+(define-function pango_ot_ruleset_get_type
+ (c-name "pango_ot_ruleset_get_type")
+ (return-type "GType")
+)
+
(define-function pango_ot_info_get
(c-name "pango_ot_info_get")
(return-type "PangoOTInfo*")
@@ -3917,11 +4079,6 @@
;; From pango-ot-private.h
-(define-function pango_ot_info_get_type
- (c-name "pango_ot_info_get_type")
- (return-type "GType")
-)
-
(define-method get_gdef
(of-object "PangoOTInfo")
(c-name "pango_ot_info_get_gdef")
@@ -3940,11 +4097,6 @@
(return-type "HB_GPOS")
)
-(define-function pango_ot_ruleset_get_type
- (c-name "pango_ot_ruleset_get_type")
- (return-type "GType")
-)
-
;; From pango-renderer.h
@@ -4095,6 +4247,18 @@
(return-type "const-PangoMatrix*")
)
+(define-method get_layout
+ (of-object "PangoRenderer")
+ (c-name "pango_renderer_get_layout")
+ (return-type "PangoLayout*")
+)
+
+(define-method get_layout_line
+ (of-object "PangoRenderer")
+ (c-name "pango_renderer_get_layout_line")
+ (return-type "PangoLayoutLine*")
+)
+
;; From pango-script.h
@@ -4161,10 +4325,6 @@
-;; From pango-script-table.h
-
-
-
;; From pango-tabs.h
(define-function pango_tab_array_new
@@ -4283,34 +4443,8 @@
(c-name "pango_extents_to_pixels")
(return-type "none")
(parameters
- '("PangoRectangle*" "ink_rect")
- '("PangoRectangle*" "logical_rect")
- )
-)
-
-(define-function pango_unichar_direction
- (c-name "pango_unichar_direction")
- (return-type "PangoDirection")
- (parameters
- '("gunichar" "ch")
- )
-)
-
-(define-function pango_find_base_dir
- (c-name "pango_find_base_dir")
- (return-type "PangoDirection")
- (parameters
- '("const-gchar*" "text")
- '("gint" "length")
- )
-)
-
-(define-function pango_get_mirror_char
- (c-name "pango_get_mirror_char")
- (return-type "gboolean")
- (parameters
- '("gunichar" "ch")
- '("gunichar*" "mirrored_ch")
+ '("PangoRectangle*" "inclusive")
+ '("PangoRectangle*" "nearest")
)
)
Modified: trunk/pango/src/renderer.hg
==============================================================================
--- trunk/pango/src/renderer.hg (original)
+++ trunk/pango/src/renderer.hg Sun Jul 27 10:11:07 2008
@@ -69,6 +69,12 @@
_WRAP_METHOD(void set_matrix(const Matrix& matrix), pango_renderer_set_matrix)
Matrix get_matrix() const;
_IGNORE(pango_renderer_get_matrix)
+
+ _WRAP_METHOD(Glib::RefPtr<Layout> get_layout(), pango_renderer_get_layout, refreturn)
+ _WRAP_METHOD(Glib::RefPtr<const Layout> get_layout() const, pango_renderer_get_layout, refreturn, constversion)
+
+ _WRAP_METHOD(Glib::RefPtr<LayoutLine> get_layout_line(), pango_renderer_get_layout_line, refreturn)
+ _WRAP_METHOD(Glib::RefPtr<const LayoutLine> get_layout_line() const, pango_renderer_get_layout_line, refreturn, constversion)
};
} /* namespace Pango */
Modified: trunk/tools/extra_defs_gen/generate_defs_pango.cc
==============================================================================
--- trunk/tools/extra_defs_gen/generate_defs_pango.cc (original)
+++ trunk/tools/extra_defs_gen/generate_defs_pango.cc Sun Jul 27 10:11:07 2008
@@ -23,11 +23,12 @@
#include <pango/pango.h>
-int main (int argc, char *argv[])
+int main (int /* argc */, char ** /* argv */)
{
- //gtk_init(&argc, &argv);
+ g_type_init();
- std::cout << "TODO: pangomm .defs?" << std::endl;
+ //Pango doesn't seem to have any public signals or properties.
+ std::cout << get_defs( PANGO_TYPE_LAYOUT ) << std::endl;
return 0;
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]
