diff src/dispextern.h @ 107589:84267baa779b

Retrospective commit from 2009-09-19. Begin work on bidi initialization and other cleanup. Remove all STANDALONE code from bidi.c. xdisp.c (init_iterator): Call bidi_init_it. Set bidi_it->bytepos if buffer position specified. (reseat_1): Don't call bidi_init_it. Call bidi_paragraph_init instead. Move back to preceding character before the call to bidi_get_next_char_visually. bidi.c: Remove all STANDALONE parts. (bidi_init_it): Init bidi_it->charpos and bidi_it->bytepos to -1. Don't call bidi_paragraph_init. Change arguments. (bidi_paragraph_init): Remove code for negative pos. dispextern.h <bidi_it>: Rename orig_type to type_after_w1 and pristine_type to orig_type.

--- a/src/dispextern.h	Thu Dec 31 16:14:26 2009 -0500
+++ b/src/dispextern.h	Thu Dec 31 16:20:15 2009 -0500
@@ -1736,9 +1736,9 @@
    remember.  */
 struct bidi_saved_info {
   int bytepos, charpos;		/* character's buffer position */
-  bidi_type_t type;		/* character bidi type */
-  bidi_type_t orig_type;	/* original type of the character, after W1 */
-  bidi_type_t pristine_type;	/* type as we found it in the buffer */
+  bidi_type_t type;		/* character's resolved bidi type */
+  bidi_type_t type_after_w1;	/* original type of the character, after W1 */
+  bidi_type_t orig_type;	/* type as we found it in the buffer */
 };
 
 /* Data type for keeping track of saved embedding levels and override
@@ -1754,9 +1754,10 @@
   int charpos;
   int ch;			/* the character itself */
   int ch_len;			/* the length of its multibyte sequence */
-  bidi_type_t type;		/* type of this character */
-  bidi_type_t orig_type;	/* original type, after overrides and W1 */
-  bidi_type_t pristine_type;	/* original type, as found in the buffer */
+  bidi_type_t type;		/* bidi type of this character, after
+				   resolving weak and neutral types */
+  bidi_type_t type_after_w1;	/* original type, after overrides and W1 */
+  bidi_type_t orig_type;	/* original type, as found in the buffer */
   int resolved_level;		/* final resolved level of this character */
   int invalid_levels;		/* how many PDFs should we ignore */
   int invalid_rl_levels;	/* how many PDFs from RLE/RLO should ignore */
@@ -2786,9 +2787,9 @@
 
 /* Defined in bidi.c */
 
-extern void bidi_init_it P_ ((int pos, bidi_dir_t dir,
-			      struct bidi_it *bidi_it));
-extern void bidi_get_next_char_visually P_ ((struct bidi_it *bidi_it));
+extern void bidi_init_it P_ ((int, int, struct bidi_it *));
+extern void bidi_get_next_char_visually P_ ((struct bidi_it *));
+extern void bidi_paragraph_init P_ ((bidi_dir_t, struct bidi_it *));
 
 /* Defined in xdisp.c */