[pango/harfbuzz-ng-external: 159/159] Merge branch 'master' into harfbuzz-ng-external
- From: Behdad Esfahbod <behdad src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [pango/harfbuzz-ng-external: 159/159] Merge branch 'master' into harfbuzz-ng-external
- Date: Fri, 17 Jun 2011 19:42:41 +0000 (UTC)
commit 0b469b7eeb36ce8181b404f24eaaacaa9ec2c3fe
Merge: 7f9f718 26092c2
Author: Behdad Esfahbod <behdad behdad org>
Date: Fri Jun 17 15:42:16 2011 -0400
Merge branch 'master' into harfbuzz-ng-external
Conflicts:
configure.in
pango/opentype/hb-common.h
pango/pango-ot-info.c
NEWS | 60 +++
build/win32/Makefile.am | 2 +
build/win32/{vs9 => }/unistd.h | 0
build/win32/vs9/Makefile.am | 5 +-
build/win32/vs9/README.txt | 57 ++-
build/win32/vs9/install.vcproj | 67 +++-
build/win32/vs9/pango.sln | 20 +-
build/win32/vs9/pango.vcprojin | 200 +++++--
build/win32/vs9/pango.vsprops | 26 +-
build/win32/vs9/pango_fc.sln | 82 +++
build/win32/vs9/pangocairo.vcprojin | 157 ++++++-
build/win32/vs9/pangoft2.vcprojin | 283 ++--------
build/win32/vs9/pangowin32.vcproj | 150 +++++-
config.h.win32.in | 14 +-
configure.in | 59 ++-
docs/Makefile.am | 20 +-
docs/pango-docs.sgml | 5 +-
docs/pango-sections.txt | 44 ++
docs/tmpl/atsui-fonts.sgml | 26 -
docs/tmpl/fonts.sgml | 18 -
docs/tmpl/glyphs.sgml | 23 -
docs/tmpl/layout.sgml | 25 +-
docs/tmpl/main.sgml | 5 -
docs/tmpl/tab-stops.sgml | 2 +-
docs/tmpl/text-attributes.sgml | 6 -
modules/basic/Makefile.am | 17 +
modules/basic/basic-coretext.c | 249 +++++++++
modules/hebrew/hebrew-shaper.c | 2 +-
pango/Makefile.am | 24 +-
pango/fonts.c | 33 +-
pango/glyphstring.c | 8 +-
pango/modules.c | 16 +-
pango/modules.h | 1 +
pango/pango-attributes.c | 24 +-
pango/pango-attributes.h | 2 +-
pango/pango-context.c | 60 ++-
pango/pango-context.h | 6 +-
pango/pango-engine.c | 59 ++-
pango/pango-font.h | 6 +-
pango/pango-fontmap.c | 16 +-
pango/pango-fontset.c | 35 +-
pango/pango-glyph-item.c | 6 +-
pango/pango-impl-utils.h | 46 --
pango/pango-language.c | 13 +-
pango/pango-language.h | 6 +-
pango/pango-layout.c | 170 ++++--
pango/pango-layout.h | 7 +-
pango/pango-matrix.c | 14 +-
pango/pango-ot-info.c | 37 +--
pango/pango-ot-ruleset.c | 41 +--
pango/pango-renderer.c | 16 +-
pango/pango-renderer.h | 2 +-
pango/pango-script.c | 14 +-
pango/pango-script.h | 12 +-
pango/pango-tabs.c | 10 +-
pango/pango-utils.c | 45 +-
pango/pango-utils.h | 12 +-
pango/pango.def | 2 +
pango/pangoatsui-fontmap.c | 39 +--
pango/pangocairo-context.c | 10 +-
pango/pangocairo-coretext.h | 55 ++
pango/pangocairo-coretextfont.c | 284 ++++++++++
pango/pangocairo-coretextfont.h | 37 ++
pango/pangocairo-coretextfontmap.c | 107 ++++
pango/pangocairo-font.c | 34 +-
pango/pangocairo-fontmap.c | 64 +--
pango/pangocoretext-fontmap.c | 1000 +++++++++++++++++++++++++++++++++++
pango/pangocoretext-private.h | 102 ++++
pango/pangocoretext.c | 204 +++++++
pango/pangocoretext.h | 80 +++
pango/pangofc-fontmap.c | 38 +-
pango/pangoft2.c | 2 +-
pango/pangox-fontmap.c | 131 ++----
pango/pangox-private.h | 5 +
pango/pangox.c | 39 +--
pango/pangox.def | 1 +
pango/pangoxft-fontmap.c | 4 +-
pango/reorder-items.c | 3 +-
78 files changed, 3556 insertions(+), 1050 deletions(-)
---
diff --cc configure.in
index 966bf64,c0928f5..4d9b157
--- a/configure.in
+++ b/configure.in
@@@ -492,8 -505,8 +511,8 @@@ GOBJECT_INTROSPECTION_CHECK([0.9.5]
#
# Modules to build
#
-arabic_modules="arabic-fc,arabic-lang"
+arabic_modules="arabic-lang"
- basic_modules="basic-fc,basic-win32,basic-x,basic-atsui"
+ basic_modules="basic-fc,basic-win32,basic-x,basic-atsui,basic-coretext"
hangul_modules="hangul-fc"
hebrew_modules="hebrew-fc"
indic_modules="indic-fc,indic-lang"
diff --cc docs/tmpl/atsui-fonts.sgml
index c8b6aa0,c8b6aa0..7f3c9dd
--- a/docs/tmpl/atsui-fonts.sgml
+++ b/docs/tmpl/atsui-fonts.sgml
@@@ -21,29 -21,29 +21,3 @@@ MacOS systems using the ATSUI text rend
<!-- ##### 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 --cc docs/tmpl/fonts.sgml
index 7b55dea,7b55dea..16ca84f
--- a/docs/tmpl/fonts.sgml
+++ b/docs/tmpl/fonts.sgml
@@@ -442,24 -442,24 +442,6 @@@ the documentation of the corresponding
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 --cc docs/tmpl/glyphs.sgml
index 399319e,399319e..926bf53
--- a/docs/tmpl/glyphs.sgml
+++ b/docs/tmpl/glyphs.sgml
@@@ -168,12 -168,12 +168,6 @@@ horizontal origin
</para>
-- xx:
-- xy:
-- yx:
-- yy:
-- x0:
-- y0:
<!-- ##### MACRO PANGO_TYPE_MATRIX ##### -->
<para>
@@@ -395,11 -395,11 +389,6 @@@ The storage for the glyph information i
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 -410,10 +399,6 @@@ of shaping text with #PangoLayout is a
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 -457,14 +442,6 @@@ None of the members of a #PangoGlyphIte
</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 --cc docs/tmpl/layout.sgml
index 54e385e,4be6a59..997507d
--- a/docs/tmpl/layout.sgml
+++ b/docs/tmpl/layout.sgml
@@@ -119,6 -119,15 +119,15 @@@ has no user-visible fields
@Returns:
+ <!-- ##### FUNCTION pango_layout_get_character_count ##### -->
+ <para>
+
+ </para>
+
- layout:
- Returns:
++ layout:
++ Returns:
+
+
<!-- ##### FUNCTION pango_layout_set_markup ##### -->
<para>
@@@ -464,6 -473,16 +473,16 @@@ The #GObject type for #PangoAlignment
@n_attrs:
+ <!-- ##### FUNCTION pango_layout_get_log_attrs_readonly ##### -->
+ <para>
+
+ </para>
+
- layout:
- n_attrs:
- Returns:
++ layout:
++ n_attrs:
++ Returns:
+
+
<!-- ##### FUNCTION pango_layout_index_to_pos ##### -->
<para>
@@@ -826,12 -845,12 +845,6 @@@ Routines for rendering PangoLayout obje
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 --cc docs/tmpl/main.sgml
index 8373b12,8373b12..112baaa
--- a/docs/tmpl/main.sgml
+++ b/docs/tmpl/main.sgml
@@@ -36,11 -36,11 +36,6 @@@ The #PangoItem structure stores informa
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 --cc docs/tmpl/tab-stops.sgml
index 62b0202,62b0202..0e28a72
--- a/docs/tmpl/tab-stops.sgml
+++ b/docs/tmpl/tab-stops.sgml
@@@ -68,7 -68,7 +68,7 @@@ The #GObject type for #PangoTabAlign
@positions_in_pixels:
@first_alignment:
@first_position:
-- Varargs:
++ :
@Returns:
diff --cc docs/tmpl/text-attributes.sgml
index 98158f8,98158f8..d7b5cb5
--- a/docs/tmpl/text-attributes.sgml
+++ b/docs/tmpl/text-attributes.sgml
@@@ -578,12 -578,12 +578,6 @@@ The #PangoColor structure is used t
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>
diff --cc pango/pango-ot-info.c
index b03fa64,be7d53a..56d28bf
--- a/pango/pango-ot-info.c
+++ b/pango/pango-ot-info.c
@@@ -25,38 -25,15 +25,13 @@@
#include "pango-impl-utils.h"
#include FT_TRUETYPE_TABLES_H
- static void pango_ot_info_class_init (GObjectClass *object_class);
static void pango_ot_info_finalize (GObject *object);
- static GObjectClass *parent_class;
-static void synthesize_class_def (PangoOTInfo *info);
-
+ G_DEFINE_TYPE (PangoOTInfo, pango_ot_info, G_TYPE_OBJECT);
- GType
- pango_ot_info_get_type (void)
+ static void
+ pango_ot_info_init (PangoOTInfo *self)
{
- static GType object_type = 0;
-
- if (G_UNLIKELY (!object_type))
- {
- const GTypeInfo object_info =
- {
- sizeof (PangoOTInfoClass),
- (GBaseInitFunc) NULL,
- (GBaseFinalizeFunc) NULL,
- (GClassInitFunc)pango_ot_info_class_init,
- NULL, /* class_finalize */
- NULL, /* class_data */
- sizeof (PangoOTInfo),
- 0, /* n_preallocs */
- NULL, /* init */
- NULL, /* value_table */
- };
-
- object_type = g_type_register_static (G_TYPE_OBJECT,
- I_("PangoOTInfo"),
- &object_info, 0);
- }
-
- return object_type;
}
static void
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]
