Commit 4b292a22 authored by Eli Zaretskii's avatar Eli Zaretskii

Rename bidi_get_next_char_visually to bidi_move_to_visually_next.

 bidi.c (bidi_move_to_visually_next): Renamed from
 bidi_get_next_char_visually.  All callers changed.
parent d07f018c
2010-05-14 Eli Zaretskii <eliz@gnu.org>
* bidi.c (bidi_move_to_visually_next): Renamed from
bidi_get_next_char_visually. All callers changed.
2010-05-14 Kenichi Handa <handa@m17n.org> 2010-05-14 Kenichi Handa <handa@m17n.org>
* dispextern.h (struct composition_it): New member reversed_p. * dispextern.h (struct composition_it): New member reversed_p.
......
...@@ -26,13 +26,13 @@ along with GNU Emacs. If not, see <http://www.gnu.org/licenses/>. */ ...@@ -26,13 +26,13 @@ along with GNU Emacs. If not, see <http://www.gnu.org/licenses/>. */
designed to be called once for every character in the buffer or designed to be called once for every character in the buffer or
string. string.
The main entry point is bidi_get_next_char_visually. Each time it The main entry point is bidi_move_to_visually_next. Each time it
is called, it finds the next character in the visual order, and is called, it finds the next character in the visual order, and
returns its information in a special structure. The caller is then returns its information in a special structure. The caller is then
expected to process this character for display or any other expected to process this character for display or any other
purposes, and call bidi_get_next_char_visually for the next purposes, and call bidi_move_to_visually_next for the next
character. See the comments in bidi_get_next_char_visually for character. See the comments in bidi_move_to_visually_next for more
more details about its algorithm that finds the next visual-order details about its algorithm that finds the next visual-order
character by resolving their levels on the fly. character by resolving their levels on the fly.
The two other entry points are bidi_paragraph_init and The two other entry points are bidi_paragraph_init and
...@@ -1876,7 +1876,7 @@ bidi_find_other_level_edge (struct bidi_it *bidi_it, int level, int end_flag) ...@@ -1876,7 +1876,7 @@ bidi_find_other_level_edge (struct bidi_it *bidi_it, int level, int end_flag)
} }
void void
bidi_get_next_char_visually (struct bidi_it *bidi_it) bidi_move_to_visually_next (struct bidi_it *bidi_it)
{ {
int old_level, new_level, next_level; int old_level, new_level, next_level;
struct bidi_it sentinel; struct bidi_it sentinel;
......
...@@ -2868,7 +2868,7 @@ extern EMACS_INT tool_bar_button_relief; ...@@ -2868,7 +2868,7 @@ extern EMACS_INT tool_bar_button_relief;
/* Defined in bidi.c */ /* Defined in bidi.c */
extern void bidi_init_it P_ ((EMACS_INT, EMACS_INT, struct bidi_it *)); extern void bidi_init_it P_ ((EMACS_INT, EMACS_INT, struct bidi_it *));
extern void bidi_get_next_char_visually P_ ((struct bidi_it *)); extern void bidi_move_to_visually_next P_ ((struct bidi_it *));
extern void bidi_paragraph_init P_ ((bidi_dir_t, struct bidi_it *)); extern void bidi_paragraph_init P_ ((bidi_dir_t, struct bidi_it *));
extern int bidi_mirror_char P_ ((int)); extern int bidi_mirror_char P_ ((int));
......
...@@ -184,7 +184,7 @@ along with GNU Emacs. If not, see <http://www.gnu.org/licenses/>. */ ...@@ -184,7 +184,7 @@ along with GNU Emacs. If not, see <http://www.gnu.org/licenses/>. */
reordering engine which is called by set_iterator_to_next and reordering engine which is called by set_iterator_to_next and
returns the next character to display in the visual order. See returns the next character to display in the visual order. See
commentary on bidi.c for more details. As far as redisplay is commentary on bidi.c for more details. As far as redisplay is
concerned, the effect of calling bidi_get_next_char_visually, the concerned, the effect of calling bidi_move_to_visually_next, the
main interface of the reordering engine, is that the iterator gets main interface of the reordering engine, is that the iterator gets
magically placed on the buffer or string position that is to be magically placed on the buffer or string position that is to be
displayed next. In other words, a linear iteration through the displayed next. In other words, a linear iteration through the
...@@ -3918,7 +3918,7 @@ handle_invisible_prop (it) ...@@ -3918,7 +3918,7 @@ handle_invisible_prop (it)
} }
do do
{ {
bidi_get_next_char_visually (&it->bidi_it); bidi_move_to_visually_next (&it->bidi_it);
} }
while (it->stop_charpos <= it->bidi_it.charpos while (it->stop_charpos <= it->bidi_it.charpos
&& it->bidi_it.charpos < newpos); && it->bidi_it.charpos < newpos);
...@@ -5276,7 +5276,7 @@ iterate_out_of_display_property (it) ...@@ -5276,7 +5276,7 @@ iterate_out_of_display_property (it)
while (it->bidi_it.charpos >= BEGV while (it->bidi_it.charpos >= BEGV
&& it->prev_stop <= it->bidi_it.charpos && it->prev_stop <= it->bidi_it.charpos
&& it->bidi_it.charpos < CHARPOS (it->position)) && it->bidi_it.charpos < CHARPOS (it->position))
bidi_get_next_char_visually (&it->bidi_it); bidi_move_to_visually_next (&it->bidi_it);
/* Record the stop_pos we just crossed, for when we cross it /* Record the stop_pos we just crossed, for when we cross it
back, maybe. */ back, maybe. */
if (it->bidi_it.charpos > CHARPOS (it->position)) if (it->bidi_it.charpos > CHARPOS (it->position))
...@@ -6311,7 +6311,7 @@ set_iterator_to_next (it, reseat_p) ...@@ -6311,7 +6311,7 @@ set_iterator_to_next (it, reseat_p)
character of the next grapheme cluster, or to the character of the next grapheme cluster, or to the
character visually after the current composition. */ character visually after the current composition. */
for (i = 0; i < it->cmp_it.nchars; i++) for (i = 0; i < it->cmp_it.nchars; i++)
bidi_get_next_char_visually (&it->bidi_it); bidi_move_to_visually_next (&it->bidi_it);
IT_BYTEPOS (*it) = it->bidi_it.bytepos; IT_BYTEPOS (*it) = it->bidi_it.bytepos;
IT_CHARPOS (*it) = it->bidi_it.charpos; IT_CHARPOS (*it) = it->bidi_it.charpos;
...@@ -6339,7 +6339,7 @@ set_iterator_to_next (it, reseat_p) ...@@ -6339,7 +6339,7 @@ set_iterator_to_next (it, reseat_p)
/* Update IT's char/byte positions to point to the last /* Update IT's char/byte positions to point to the last
character of the previous grapheme cluster, or the character of the previous grapheme cluster, or the
character visually after the current composition. */ character visually after the current composition. */
bidi_get_next_char_visually (&it->bidi_it); bidi_move_to_visually_next (&it->bidi_it);
IT_BYTEPOS (*it) = it->bidi_it.bytepos; IT_BYTEPOS (*it) = it->bidi_it.bytepos;
IT_CHARPOS (*it) = it->bidi_it.charpos; IT_CHARPOS (*it) = it->bidi_it.charpos;
...@@ -6378,7 +6378,7 @@ set_iterator_to_next (it, reseat_p) ...@@ -6378,7 +6378,7 @@ set_iterator_to_next (it, reseat_p)
direction (a.k.a. its base embedding level). */ direction (a.k.a. its base embedding level). */
if (it->bidi_it.new_paragraph) if (it->bidi_it.new_paragraph)
bidi_paragraph_init (it->paragraph_embedding, &it->bidi_it); bidi_paragraph_init (it->paragraph_embedding, &it->bidi_it);
bidi_get_next_char_visually (&it->bidi_it); bidi_move_to_visually_next (&it->bidi_it);
IT_BYTEPOS (*it) = it->bidi_it.bytepos; IT_BYTEPOS (*it) = it->bidi_it.bytepos;
IT_CHARPOS (*it) = it->bidi_it.charpos; IT_CHARPOS (*it) = it->bidi_it.charpos;
if (prev_scan_dir != it->bidi_it.scan_dir) if (prev_scan_dir != it->bidi_it.scan_dir)
...@@ -6858,7 +6858,7 @@ next_element_from_buffer (it) ...@@ -6858,7 +6858,7 @@ next_element_from_buffer (it)
/* If we are at the beginning of a line, we can produce the /* If we are at the beginning of a line, we can produce the
next element right away. */ next element right away. */
bidi_paragraph_init (it->paragraph_embedding, &it->bidi_it); bidi_paragraph_init (it->paragraph_embedding, &it->bidi_it);
bidi_get_next_char_visually (&it->bidi_it); bidi_move_to_visually_next (&it->bidi_it);
} }
else else
{ {
...@@ -6876,7 +6876,7 @@ next_element_from_buffer (it) ...@@ -6876,7 +6876,7 @@ next_element_from_buffer (it)
{ {
/* Now return to buffer position where we were asked to /* Now return to buffer position where we were asked to
get the next display element, and produce that. */ get the next display element, and produce that. */
bidi_get_next_char_visually (&it->bidi_it); bidi_move_to_visually_next (&it->bidi_it);
} }
while (it->bidi_it.bytepos != orig_bytepos while (it->bidi_it.bytepos != orig_bytepos
&& it->bidi_it.bytepos < ZV_BYTE); && it->bidi_it.bytepos < ZV_BYTE);
...@@ -7100,7 +7100,7 @@ next_element_from_composition (it) ...@@ -7100,7 +7100,7 @@ next_element_from_composition (it)
/* Resync the bidi iterator with IT's new position. /* Resync the bidi iterator with IT's new position.
FIXME: this doesn't support bidirectional text. */ FIXME: this doesn't support bidirectional text. */
while (it->bidi_it.charpos < IT_CHARPOS (*it)) while (it->bidi_it.charpos < IT_CHARPOS (*it))
bidi_get_next_char_visually (&it->bidi_it); bidi_move_to_visually_next (&it->bidi_it);
} }
return 0; return 0;
} }
...@@ -7116,7 +7116,7 @@ next_element_from_composition (it) ...@@ -7116,7 +7116,7 @@ next_element_from_composition (it)
correct (struct glyph)->charpos. */ correct (struct glyph)->charpos. */
int i; int i;
for (i = 0; i < it->cmp_it.nchars - 1; i++) for (i = 0; i < it->cmp_it.nchars - 1; i++)
bidi_get_next_char_visually (&it->bidi_it); bidi_move_to_visually_next (&it->bidi_it);
IT_CHARPOS (*it) = it->bidi_it.charpos; IT_CHARPOS (*it) = it->bidi_it.charpos;
IT_BYTEPOS (*it) = it->bidi_it.bytepos; IT_BYTEPOS (*it) = it->bidi_it.bytepos;
it->position = it->current.pos; it->position = it->current.pos;
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment