diff options
author | Behdad Esfahbod <behdad@behdad.org> | 2012-08-16 20:51:57 -0400 |
---|---|---|
committer | Behdad Esfahbod <behdad@behdad.org> | 2012-08-16 21:10:10 -0400 |
commit | 8168660e5f1906aed2a45d30529058f51473bcef (patch) | |
tree | 8c5a9172672404c0f85bc78f3ba31a566cb52aba /docs/tmpl/glyphs.sgml | |
parent | feff5a6e2682048a07a6ba09af83254e290bf394 (diff) | |
parent | 656d473b52e3edea621c0681d2ba14363f257e84 (diff) | |
download | pango-8168660e5f1906aed2a45d30529058f51473bcef.tar.gz |
Merge branch 'harfbuzz-ng-external'
Conflicts:
configure.in
docs/tmpl/text-attributes.sgml
modules/arabic/arabic-ot.c
modules/indic/indic-ot.c
pango/opentype/Makefile.am
pango/opentype/hb-blob.c
pango/opentype/hb-buffer-private.h
pango/opentype/hb-common.h
pango/opentype/hb-ot-layout-gsubgpos-private.hh
pango/opentype/hb-private.h
pango/pango-ot-info.c
Diffstat (limited to 'docs/tmpl/glyphs.sgml')
-rw-r--r-- | docs/tmpl/glyphs.sgml | 30 |
1 files changed, 13 insertions, 17 deletions
diff --git a/docs/tmpl/glyphs.sgml b/docs/tmpl/glyphs.sgml index 399319eb..5d4be350 100644 --- a/docs/tmpl/glyphs.sgml +++ b/docs/tmpl/glyphs.sgml @@ -395,11 +395,9 @@ 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. +@num_glyphs: +@glyphs: +@log_clusters: <!-- ##### STRUCT PangoGlyphItem ##### --> <para> @@ -410,10 +408,8 @@ 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. +@item: +@glyphs: <!-- ##### STRUCT PangoGlyphItemIter ##### --> <para> @@ -457,14 +453,14 @@ 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 +@glyph_item: +@text: +@start_glyph: +@start_index: +@start_char: +@end_glyph: +@end_index: +@end_char: @Since: 1.22 <!-- ##### MACRO PANGO_TYPE_GLYPH_STRING ##### --> |