comparison src/bidi.c @ 107595:69c12db7031d

Retrospective commit from 2009-10-05. Continue working on paragraph base direction. Support per-buffer default paragraph direction. buffer.h (struct buffer): New member paragraph_direction. buffer.c (init_buffer_once): Initialize it. (syms_of_buffer): Declare Lisp variables default-paragraph-direction and paragraph-direction. dispextern.h (struct it): New member paragraph_embedding. xdisp.c (init_iterator): Initialize it from the buffer's value of paragraph-direction. <Qright_to_left, Qleft_to_right>: New variables. (syms_of_xdisp): Initialize and staticpro them. (set_iterator_to_next, next_element_from_buffer): Use the value of paragraph_embedding to determine the paragraph direction. bidi.c (bidi_line_init): Fix second argument to bidi_set_sor_type. (bidi_init_it): Initialize paragraph_dir to NEUTRAL_DIR. (bidi_get_next_char_visually): Record the last character of the separator in separator_limit, not the character after that. (bidi_find_paragraph_start): Accept character and byte positions instead of the whole iterator stricture. All callers changed.

107594:40b49fa464cf

  bidi_it->level_stack[0].override = NEUTRAL_DIR; /* X1 */
  bidi_it->invalid_levels = 0;
  bidi_it->invalid_rl_levels = -1;
  bidi_it->next_en_pos = -1;
  bidi_it->next_for_ws.type = UNKNOWN_BT;
  bidi_set_sor_type (bidi_it, bidi_it->paragraph_dir,
		     bidi_it->level_stack[0].level); /* X10 */

  bidi_cache_reset ();
}

/* Find the beginning of this paragraph by looking back in the buffer.
   Value is the byte position of the paragraph's beginning.  */
static EMACS_INT
bidi_find_paragraph_start (struct bidi_it *bidi_it)
{
  Lisp_Object re = Fbuffer_local_value (Qparagraph_start, Fcurrent_buffer ());
  EMACS_INT pos = bidi_it->charpos;
  EMACS_INT pos_byte = bidi_it->bytepos;
  EMACS_INT limit = ZV, limit_byte = ZV_BYTE;

  if (!STRINGP (re))
    re = fallback_paragraph_start_re;
  while (pos_byte > BEGV_BYTE

    }
  return pos_byte;
}

/* Determine the direction, a.k.a. base embedding level, of the
   paragraph we are about to iterate through.  */
void
bidi_paragraph_init (bidi_dir_t dir, struct bidi_it *bidi_it)
{
  EMACS_INT bytepos = bidi_it->bytepos;

	 for the separator to be exhausted; use the previous paragraph
	 direction.  */
      if (bidi_it->charpos < bidi_it->separator_limit)
	return;

      /* If we are before another paragraph separator, continue
	 through that with the previous paragraph direction.  */
      sep_len = bidi_at_paragraph_end (bidi_it->charpos, bytepos);
      if (sep_len >= 0)
	{
	  bidi_it->separator_limit += sep_len + 1;
	  return;
	}
      else if (sep_len == -2)
	/* We are in the middle of a paragraph.  Search back to where
	   this paragraph starts.  */
	bytepos = bidi_find_paragraph_start (bidi_it);

      /* We should always be at the beginning of a new line at this
	 point.  */
      if (!(bytepos == BEGV_BYTE
	    || FETCH_CHAR (bytepos) == '\n'
	    || FETCH_CHAR (bytepos - 1) == '\n'))
	abort ();

      bidi_it->separator_limit = -1;
      bidi_it->new_paragraph = 0;
      ch = FETCH_CHAR (bytepos);

	bidi_it->paragraph_dir = L2R;
    }
  else
    abort ();

  /* Contrary to UAX#9 clause P3, we only default to L2R if we have no
     previous usable paragraph direction.  */
  if (bidi_it->paragraph_dir == NEUTRAL_DIR)
    bidi_it->paragraph_dir = L2R; /* P3 */
  if (bidi_it->paragraph_dir == R2L)
    bidi_it->level_stack[0].level == 1;
  else
    bidi_it->level_stack[0].level == 0;

  bidi_line_init (bidi_it);
}

/* Do whatever UAX#9 clause X8 says should be done at paragraph's

  bidi_it->bytepos = bytepos;
  bidi_it->first_elt = 1;
  bidi_set_paragraph_end (bidi_it);
  bidi_it->new_paragraph = 1;
  bidi_it->separator_limit = -1;
  bidi_it->type = NEUTRAL_B;
  bidi_it->type_after_w1 = UNKNOWN_BT;
  bidi_it->orig_type = UNKNOWN_BT;
  bidi_it->prev_was_pdf = 0;
  bidi_it->prev.type = bidi_it->prev.type_after_w1 = UNKNOWN_BT;

      /* Finally, deliver the next character in the new direction.  */
      next_level = bidi_level_of_next_char (bidi_it);
    }

  /* Take note when we are at the end of the paragraph.  The next time
     we are about to be called, set_iterator_to_next will
     automatically reinit the paragraph direction, if needed.  */
  if (bidi_it->scan_dir == 1
      && bidi_it->orig_type == NEUTRAL_B
      && bidi_it->bytepos < ZV_BYTE)
    {
      EMACS_INT sep_len =
	bidi_at_paragraph_end (bidi_it->charpos + 1,
			       bidi_it->bytepos + bidi_it->ch_len);
      if (sep_len >= 0)
	{
	  bidi_it->new_paragraph = 1;
	  /* Record the buffer position of the first character after
	     the paragraph separator.  */
	  bidi_it->separator_limit = bidi_it->charpos + 1 + sep_len + 1;
	}
    }

  if (bidi_it->scan_dir == 1 && bidi_cache_idx)
    {

107595:69c12db7031d

  bidi_it->level_stack[0].override = NEUTRAL_DIR; /* X1 */
  bidi_it->invalid_levels = 0;
  bidi_it->invalid_rl_levels = -1;
  bidi_it->next_en_pos = -1;
  bidi_it->next_for_ws.type = UNKNOWN_BT;
  bidi_set_sor_type (bidi_it,
		     bidi_it->paragraph_dir == R2L ? 1 : 0,
		     bidi_it->level_stack[0].level); /* X10 */

  bidi_cache_reset ();
}

/* Find the beginning of this paragraph by looking back in the buffer.
   Value is the byte position of the paragraph's beginning.  */
static EMACS_INT
bidi_find_paragraph_start (EMACS_INT pos, EMACS_INT pos_byte)
{
  Lisp_Object re = Fbuffer_local_value (Qparagraph_start, Fcurrent_buffer ());
  EMACS_INT limit = ZV, limit_byte = ZV_BYTE;

  if (!STRINGP (re))
    re = fallback_paragraph_start_re;
  while (pos_byte > BEGV_BYTE

    }
  return pos_byte;
}

/* Determine the direction, a.k.a. base embedding level, of the
   paragraph we are about to iterate through.  If DIR is either L2R or
   R2L, just use that.  Otherwise, determine the paragraph direction
   from the first strong character of the paragraph.

   Note that this gives the paragraph separator the same direction as
   the preceding paragraph, even though Emacs generally views the
   separartor as not belonging to any paragraph.  */
void
bidi_paragraph_init (bidi_dir_t dir, struct bidi_it *bidi_it)
{
  EMACS_INT bytepos = bidi_it->bytepos;

	 for the separator to be exhausted; use the previous paragraph
	 direction.  */
      if (bidi_it->charpos < bidi_it->separator_limit)
	return;

      /* If we are on a newline, get past it to where the next
	 paragraph might start.  */
      if (FETCH_CHAR (bytepos) == '\n')
	{
	  bytepos++;
	  pos = bidi_it->charpos + 1;
	}

      /* We are either at the beginning of a paragraph or in the
	 middle of it.  Find where this paragraph starts.  */
      bytepos = bidi_find_paragraph_start (pos, bytepos);

      /* We should always be at the beginning of a new line at this
	 point.  */
      if (!(bytepos == BEGV_BYTE || FETCH_CHAR (bytepos - 1) == '\n'))
	abort ();

      bidi_it->separator_limit = -1;
      bidi_it->new_paragraph = 0;
      ch = FETCH_CHAR (bytepos);

	bidi_it->paragraph_dir = L2R;
    }
  else
    abort ();

  /* Contrary to UAX#9 clause P3, we only default the paragraph
     direction to L2R if we have no previous usable paragraph
     direction.  */
  if (bidi_it->paragraph_dir == NEUTRAL_DIR)
    bidi_it->paragraph_dir = L2R; /* P3 and ``higher protocols'' */
  if (bidi_it->paragraph_dir == R2L)
    bidi_it->level_stack[0].level = 1;
  else
    bidi_it->level_stack[0].level = 0;

  bidi_line_init (bidi_it);
}

/* Do whatever UAX#9 clause X8 says should be done at paragraph's

  bidi_it->bytepos = bytepos;
  bidi_it->first_elt = 1;
  bidi_set_paragraph_end (bidi_it);
  bidi_it->new_paragraph = 1;
  bidi_it->separator_limit = -1;
  bidi_it->paragraph_dir = NEUTRAL_DIR;
  bidi_it->type = NEUTRAL_B;
  bidi_it->type_after_w1 = UNKNOWN_BT;
  bidi_it->orig_type = UNKNOWN_BT;
  bidi_it->prev_was_pdf = 0;
  bidi_it->prev.type = bidi_it->prev.type_after_w1 = UNKNOWN_BT;

      /* Finally, deliver the next character in the new direction.  */
      next_level = bidi_level_of_next_char (bidi_it);
    }

  /* Take note when we have just processed the newline that precedes
     the end of the paragraph.  The next time we are about to be
     called, set_iterator_to_next will automatically reinit the
     paragraph direction, if needed.  We do this at the newline before
     the paragraph separator, because the next character might not be
     the first character of the next paragraph, due to the bidi
     reordering.  */
  if (bidi_it->scan_dir == 1
      && bidi_it->orig_type == NEUTRAL_B
      && bidi_it->bytepos < ZV_BYTE)
    {
      EMACS_INT sep_len =
	bidi_at_paragraph_end (bidi_it->charpos + 1,
			       bidi_it->bytepos + bidi_it->ch_len);
      if (sep_len >= 0)
	{
	  bidi_it->new_paragraph = 1;
	  /* Record the buffer position of the last character of the
	     paragraph separator.  */
	  bidi_it->separator_limit = bidi_it->charpos + 1 + sep_len;
	}
    }

  if (bidi_it->scan_dir == 1 && bidi_cache_idx)
    {