diff options
| author | Behdad Esfahbod <behdad@gnome.org> | 2008-08-06 08:39:43 +0000 |
|---|---|---|
| committer | Behdad Esfahbod <behdad@src.gnome.org> | 2008-08-06 08:39:43 +0000 |
| commit | d0f90842d2a7c0a35eae34c54d174d68fc0f3dc0 (patch) | |
| tree | fd41ddc93b500f9fbf03b961e4852a308512b194 /pango/ellipsize.c | |
| parent | a9c7938fc2ac7ea173f00feb7e3fafbec1aabc29 (diff) | |
| download | pango-d0f90842d2a7c0a35eae34c54d174d68fc0f3dc0.tar.gz | |
Bug 377948 – Make pango_glyph_item_iter public
2008-08-06 Behdad Esfahbod <behdad@gnome.org>
Bug 377948 – Make pango_glyph_item_iter public
* pango/pango-glyph-item.c (pango_glyph_item_iter_copy),
(pango_glyph_item_iter_free), (pango_glyph_item_iter_get_type),
(pango_glyph_item_iter_next_cluster),
(pango_glyph_item_iter_prev_cluster),
(pango_glyph_item_iter_init_start),
(pango_glyph_item_iter_init_end), (pango_glyph_item_apply_attrs),
(pango_glyph_item_letter_space):
* pango/pango-glyph-item.h:
New public API, for iterating a PangoGlyphItem:
PangoGlyphItemIter
PANGO_TYPE_GLYPH_ITEM_ITER
pango_glyph_item_iter_copy()
pango_glyph_item_iter_free()
pango_glyph_item_iter_init_start()
pango_glyph_item_iter_init_end()
pango_glyph_item_iter_next_cluster()
pango_glyph_item_iter_prev_cluster()
* pango/pango.def:
* docs/tmpl/glyphs.sgml:
* docs/pango-sections.txt:
* pango/Makefile.am:
* pango/ellipsize.c (line_iter_next_cluster),
(line_iter_prev_cluster), (find_initial_span):
* pango/pango-layout.c (justify_words):
Update.
* pango/pango-glyph-item-private.h:
Remove.
svn path=/trunk/; revision=2679
Diffstat (limited to 'pango/ellipsize.c')
| -rw-r--r-- | pango/ellipsize.c | 22 |
1 files changed, 11 insertions, 11 deletions
diff --git a/pango/ellipsize.c b/pango/ellipsize.c index bfdeb3ae..3a39a789 100644 --- a/pango/ellipsize.c +++ b/pango/ellipsize.c @@ -22,7 +22,7 @@ #include "config.h" #include <string.h> -#include "pango-glyph-item-private.h" +#include "pango-glyph-item.h" #include "pango-layout-private.h" #include "pango-engine-private.h" @@ -187,16 +187,16 @@ static gboolean line_iter_next_cluster (EllipsizeState *state, LineIter *iter) { - if (!_pango_glyph_item_iter_next_cluster (&iter->run_iter)) + if (!pango_glyph_item_iter_next_cluster (&iter->run_iter)) { if (iter->run_index == state->n_runs - 1) return FALSE; else { iter->run_index++; - _pango_glyph_item_iter_init_start (&iter->run_iter, - state->run_info[iter->run_index].run, - state->layout->text); + pango_glyph_item_iter_init_start (&iter->run_iter, + state->run_info[iter->run_index].run, + state->layout->text); } } @@ -209,16 +209,16 @@ static gboolean line_iter_prev_cluster (EllipsizeState *state, LineIter *iter) { - if (!_pango_glyph_item_iter_prev_cluster (&iter->run_iter)) + if (!pango_glyph_item_iter_prev_cluster (&iter->run_iter)) { if (iter->run_index == 0) return FALSE; else { iter->run_index--; - _pango_glyph_item_iter_init_end (&iter->run_iter, - state->run_info[iter->run_index].run, - state->layout->text); + pango_glyph_item_iter_init_end (&iter->run_iter, + state->run_info[iter->run_index].run, + state->layout->text); } } @@ -513,9 +513,9 @@ find_initial_span (EllipsizeState *state) glyph_item = state->run_info[i].run; cluster_width = 0; /* Quiet GCC, the line must have at least one cluster */ - for (have_cluster = _pango_glyph_item_iter_init_start (run_iter, glyph_item, state->layout->text); + for (have_cluster = pango_glyph_item_iter_init_start (run_iter, glyph_item, state->layout->text); have_cluster; - have_cluster = _pango_glyph_item_iter_next_cluster (run_iter)) + have_cluster = pango_glyph_item_iter_next_cluster (run_iter)) { cluster_width = get_cluster_width (&state->gap_start_iter); |