Merge branch 'master' into harfbuzz-ng-external

Conflicts:
	configure.in
	pango/opentype/hb-common.h
	pango/pango-ot-info.c

10 files changed, 87 insertions, 87 deletions

diff --git a/docs/Makefile.am b/docs/Makefile.am
index b398e811..129f2cb3 100644
--- a/docs/Makefile.am
+++ b/docs/Makefile.am
@@ -7,7 +7,7 @@ DOC_MODULE=pango
 DOC_MAIN_SGML_FILE=pango-docs.sgml
 
 # Extra options to supply to gtkdoc-scan
-SCAN_OPTIONS=--deprecated-guards="PANGO_DISABLE_DEPRECATED"
+SCAN_OPTIONS=--deprecated-guards="PANGO_DISABLE_DEPRECATED" --rebuild-types
 
 # The directory containing the source code. Relative to $(srcdir)
 DOC_SOURCE_DIR=../pango
@@ -45,6 +45,24 @@ IGNORE_HFILES=			\
 	pango-script-lang-table.h	\
 	pango-language-sample-table.h
 
+if HAVE_CORE_TEXT
+else
+IGNORE_HFILES+=			\
+	pangocoretext.h			\
+	pangocoretext-private.h		\
+	pangocairo-coretext.h		\
+	pangocairo-coretextfont.h
+endif
+
+if HAVE_CAIRO_ATSUI
+else
+IGNORE_HFILES+=			\
+	pangoatsui.h			\
+	pangoatsui-private.h		\
+	pangocairo-atsui.h		\
+	pangocairo-atsuifont.h
+endif
+
 # CFLAGS and LDFLAGS for compiling scan program. Only needed
 # if $(DOC_MODULE).types is non-empty.
 INCLUDES =               	\
diff --git a/docs/pango-docs.sgml b/docs/pango-docs.sgml
index a769ec1f..a94cb2bc 100644
--- a/docs/pango-docs.sgml
+++ b/docs/pango-docs.sgml
@@ -136,6 +136,9 @@
     <title>Index of new symbols in 1.26</title>
   </index>
   <index id="index-1.28" role="1.28">
-    <title>Index of new symbols in 1.26</title>
+    <title>Index of new symbols in 1.28</title>
+  </index>
+  <index id="index-1.30" role="1.30">
+    <title>Index of new symbols in 1.30</title>
   </index>
 </book>
diff --git a/docs/pango-sections.txt b/docs/pango-sections.txt
index 7b89b875..d8f2c05e 100644
--- a/docs/pango-sections.txt
+++ b/docs/pango-sections.txt
@@ -442,6 +442,7 @@ pango_layout_context_changed
 
 pango_layout_set_text
 pango_layout_get_text
+pango_layout_get_character_count
 pango_layout_set_markup
 pango_layout_set_markup_with_accel
 pango_layout_set_attributes
@@ -481,6 +482,7 @@ PANGO_TYPE_ALIGNMENT
 
 pango_layout_get_unknown_glyphs_count
 pango_layout_get_log_attrs
+pango_layout_get_log_attrs_readonly
 
 pango_layout_index_to_pos
 pango_layout_index_to_line_x
@@ -914,6 +916,48 @@ pango_cairo_atsui_font_get_type
 </SECTION>
 
 <SECTION>
+<TITLE>CoreText Fonts</TITLE>
+<FILE>coretext-fonts</FILE>
+PANGO_RENDER_TYPE_CORE_TEXT
+pango_core_text_font_get_ctfont
+<SUBSECTION Standard>
+PANGO_CAIRO_CORE_TEXT_FONT
+PANGO_CAIRO_CORE_TEXT_FONT_CLASS
+PANGO_CAIRO_CORE_TEXT_FONT_GET_CLASS
+PANGO_CAIRO_CORE_TEXT_FONT_MAP
+PANGO_CORE_TEXT_FONT
+PANGO_CORE_TEXT_FONT_CLASS
+PANGO_CORE_TEXT_FONT_GET_CLASS
+PANGO_CORE_TEXT_FONT_MAP
+PANGO_CORE_TEXT_FONT_MAP_CLASS
+PANGO_CORE_TEXT_FONT_MAP_GET_CLASS
+PANGO_CORE_TEXT_IS_FONT_MAP
+PANGO_IS_CAIRO_CORE_TEXT_FONT_CLASS
+PANGO_IS_CAIRO_CORE_TEXT_FONT_MAP
+PANGO_IS_CORE_TEXT_FONT
+PANGO_IS_CORE_TEXT_FONT_CLASS
+PANGO_IS_CORE_TEXT_FONT_MAP_CLASS
+PANGO_TYPE_CAIRO_CORE_TEXT_FONT
+PANGO_TYPE_CAIRO_CORE_TEXT_FONT_MAP
+PANGO_TYPE_CORE_TEXT_FONT
+PANGO_TYPE_CORE_TEXT_FONT_MAP
+PangoCairoCoreTextFont
+PangoCairoCoreTextFontClass
+PangoCairoCoreTextFontMap
+PangoCoreTextFace
+PangoCoreTextFamily
+PangoCoreTextFont
+PangoCoreTextFontClass
+PangoCoreTextFontMap
+PangoCoreTextFontMapClass
+PangoCoreTextFontPrivate
+pango_cairo_core_text_font_get_type
+pango_cairo_core_text_font_map_get_type
+pango_core_text_font_get_type
+pango_core_text_font_map_get_type
+</SECTION>
+
+<SECTION>
 <FILE>pangofc-fontmap</FILE>
 <TITLE>PangoFcFontMap</TITLE>
 PangoFcFontMap
diff --git a/docs/tmpl/atsui-fonts.sgml b/docs/tmpl/atsui-fonts.sgml
index c8b6aa06..7f3c9dd3 100644
--- a/docs/tmpl/atsui-fonts.sgml
+++ b/docs/tmpl/atsui-fonts.sgml
@@ -21,29 +21,3 @@ MacOS systems using the ATSUI text rendering subsystem.
 <!-- ##### SECTION Image ##### -->
 
 
-<!-- ##### MACRO PANGO_RENDER_TYPE_ATSUI ##### -->
-<para>
-A string constant identifying the ATSUI renderer. The associated quark (see
-g_quark_from_string()) is used to identify the renderer in pango_find_map().
-</para>
-
-
-
-<!-- ##### FUNCTION pango_atsui_font_get_cgfont ##### -->
-<para>
-
-</para>
-
-@font: 
-@Returns: 
-
-
-<!-- ##### FUNCTION pango_atsui_font_get_atsfont ##### -->
-<para>
-
-</para>
-
-@font: 
-@Returns: 
-
-
diff --git a/docs/tmpl/fonts.sgml b/docs/tmpl/fonts.sgml
index 7b55dea7..16ca84f1 100644
--- a/docs/tmpl/fonts.sgml
+++ b/docs/tmpl/fonts.sgml
@@ -442,24 +442,6 @@ the documentation of the corresponding getters for documentation
 of their meaning.
 </para>
 
-@ref_count: reference count.  Used internally.  See pango_font_metrics_ref()
-            and pango_font_metrics_unref().
-@ascent: the distance from the baseline to the highest point of the glyphs of
-	 the font. This is positive in practically all fonts.
-@descent: the distance from the baseline to the lowest point of the glyphs of
-	 the font. This is positive in practically all fonts.
-@approximate_char_width: approximate average width of the regular glyphs of
-         the font.  Note that for this calculation, East Asian characters
-	 (those passing g_unichar_iswide()) are counted as double-width.
-	 This produces a more uniform value for this measure across languages
-	 and results in more uniform and more expected UI sizes.
-@approximate_digit_width: approximate average width of the glyphs for digits
-         of the font.
-@underline_position: position of the underline. This is normally negative.
-@underline_thickness: thickness of the underline.
-@strikethrough_position: position of the strikethrough line. This is
-	 normally positive.
-@strikethrough_thickness: thickness of the strikethrough line.
 
 <!-- ##### MACRO PANGO_TYPE_FONT_METRICS ##### -->
 <para>
diff --git a/docs/tmpl/glyphs.sgml b/docs/tmpl/glyphs.sgml
index 399319eb..926bf539 100644
--- a/docs/tmpl/glyphs.sgml
+++ b/docs/tmpl/glyphs.sgml
@@ -168,12 +168,6 @@ horizontal origin.
 
 </para>
 
-@xx: 
-@xy: 
-@yx: 
-@yy: 
-@x0: 
-@y0: 
 
 <!-- ##### MACRO PANGO_TYPE_MATRIX ##### -->
 <para>
@@ -395,11 +389,6 @@ The storage for the glyph information is owned
 by the structure which simplifies memory management.
 </para>
 
-@num_glyphs: the number of glyphs in the string.
-@glyphs: an array of #PangoGlyphInfo structures of length <structfield>num_glyphs</structfield>.
-@log_clusters: for each glyph, byte index of the starting character for the
-cluster. The indices are relative to the start of the text
-corresponding to the PangoGlyphString.
 
 <!-- ##### STRUCT PangoGlyphItem ##### -->
 <para>
@@ -410,10 +399,6 @@ of shaping text with #PangoLayout is a list of #PangoLayoutLine,
 each of which contains a list of #PangoGlyphItem.
 </para>
 
-@item: a #PangoItem structure that provides information
-       about a segment of text.
-@glyphs: the glyphs obtained by shaping the text
-         corresponding to @item.
 
 <!-- ##### STRUCT PangoGlyphItemIter ##### -->
 <para>
@@ -457,14 +442,6 @@ None of the members of a #PangoGlyphItemIter should be modified manually.
 
 </para>
 
-@glyph_item: the #PangoGlyphItem this iterator iterates over
-@text: the UTF-8 text that @glyph_item refers to
-@start_glyph: starting glyph of the cluster
-@start_index: starting text index of the cluster
-@start_char: starting number of characters of the cluster
-@end_glyph: ending glyph of the cluster
-@end_index: ending text index of the cluster
-@end_char: ending number of characters of the cluster
 @Since: 1.22
 
 <!-- ##### MACRO PANGO_TYPE_GLYPH_STRING ##### -->
diff --git a/docs/tmpl/layout.sgml b/docs/tmpl/layout.sgml
index 54e385ed..997507df 100644
--- a/docs/tmpl/layout.sgml
+++ b/docs/tmpl/layout.sgml
@@ -119,6 +119,15 @@ has no user-visible fields.
 @Returns: 
 
 
+<!-- ##### FUNCTION pango_layout_get_character_count ##### -->
+<para>
+
+</para>
+
+@layout: 
+@Returns: 
+
+
 <!-- ##### FUNCTION pango_layout_set_markup ##### -->
 <para>
 
@@ -464,6 +473,16 @@ The #GObject type for #PangoAlignment.
 @n_attrs: 
 
 
+<!-- ##### FUNCTION pango_layout_get_log_attrs_readonly ##### -->
+<para>
+
+</para>
+
+@layout: 
+@n_attrs: 
+@Returns: 
+
+
 <!-- ##### FUNCTION pango_layout_index_to_pos ##### -->
 <para>
 
@@ -826,12 +845,6 @@ Routines for rendering PangoLayout objects are provided in
 code specific to each rendering system.
 </para>
 
-@layout: the parent layout for this line
-@start_index: the start of the line as byte index into @layout->text
-@length: the length of the line in bytes
-@runs: a list containing the runs of the line in visual order
-@is_paragraph_start: %TRUE if this is the first line of the paragraph
-@resolved_dir: the resolved #PangoDirection of the line
 
 <!-- ##### TYPEDEF PangoLayoutRun ##### -->
 <para>
diff --git a/docs/tmpl/main.sgml b/docs/tmpl/main.sgml
index 8373b123..112baaaf 100644
--- a/docs/tmpl/main.sgml
+++ b/docs/tmpl/main.sgml
@@ -36,11 +36,6 @@ The #PangoItem structure stores information about
 a segment of text. It contains the following fields:
 </para>
 
-@offset: the offset of the segment from the beginning of the
-         string in bytes.
-@length: the length of the segment in bytes.
-@num_chars: the length of the segment in characters.
-@analysis: the properties of the segment.
 
 <!-- ##### STRUCT PangoAnalysis ##### -->
 <para>
diff --git a/docs/tmpl/tab-stops.sgml b/docs/tmpl/tab-stops.sgml
index 62b02020..0e28a72e 100644
--- a/docs/tmpl/tab-stops.sgml
+++ b/docs/tmpl/tab-stops.sgml
@@ -68,7 +68,7 @@ The #GObject type for #PangoTabAlign.
 @positions_in_pixels: 
 @first_alignment: 
 @first_position: 
-@Varargs: 
+@...: 
 @Returns: 
 
 
diff --git a/docs/tmpl/text-attributes.sgml b/docs/tmpl/text-attributes.sgml
index 98158f80..d7b5cb51 100644
--- a/docs/tmpl/text-attributes.sgml
+++ b/docs/tmpl/text-attributes.sgml
@@ -578,12 +578,6 @@ The #PangoColor structure is used to
 represent a color in an uncalibrated RGB color-space.
 </para>
 
-@red: The red component of the color. This is a value between 0 and 65535, 
-      with 65535 indicating full intensity.
-@green: The green component of the color. This is a value between 0 and 65535, 
-      with 65535 indicating full intensity.
-@blue: The blue component of the color. This is a value between 0 and 65535, 
-      with 65535 indicating full intensity.
 
 <!-- ##### MACRO PANGO_TYPE_COLOR ##### -->
 <para>