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/fonts.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/fonts.sgml')
| -rw-r--r-- | docs/tmpl/fonts.sgml | 29 |
1 files changed, 10 insertions, 19 deletions
diff --git a/docs/tmpl/fonts.sgml b/docs/tmpl/fonts.sgml index 7b55dea7..d4ce3160 100644 --- a/docs/tmpl/fonts.sgml +++ b/docs/tmpl/fonts.sgml @@ -442,24 +442,15 @@ 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. +@ref_count: +@ascent: +@descent: +@approximate_char_width: +@approximate_digit_width: +@underline_position: +@underline_thickness: +@strikethrough_position: +@strikethrough_thickness: <!-- ##### MACRO PANGO_TYPE_FONT_METRICS ##### --> <para> @@ -984,7 +975,7 @@ a particular #PangoFontset implementation. @fontset: @font: -@data: +@user_data: @Returns: |