X-Git-Url: https://git.hcoop.net/bpt/emacs.git/blobdiff_plain/db856169c248b363fe3dc5ee4e8b1dd18c3a05a2..8510724d46951d651a78424e12b93ccee100c665:/src/composite.c
diff --git a/src/composite.c b/src/composite.c
index 3b3743b6b2..44fb9c43a9 100644
--- a/src/composite.c
+++ b/src/composite.c
@@ -1,18 +1,19 @@
/* Composite sequence support.
- Copyright (C) 2001, 2002, 2003, 2004, 2005 Free Software Foundation, Inc.
- Copyright (C) 1999
+ Copyright (C) 2001, 2002, 2003, 2004, 2005,
+ 2006, 2007, 2008, 2009 Free Software Foundation, Inc.
+ Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009
National Institute of Advanced Industrial Science and Technology (AIST)
Registration Number H14PRO021
- Copyright (C) 2003
+ Copyright (C) 2003, 2006
National Institute of Advanced Industrial Science and Technology (AIST)
Registration Number H13PRO009
This file is part of GNU Emacs.
-GNU Emacs is free software; you can redistribute it and/or modify
+GNU Emacs is free software: you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
-the Free Software Foundation; either version 2, or (at your option)
-any later version.
+the Free Software Foundation, either version 3 of the License, or
+(at your option) any later version.
GNU Emacs is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
@@ -20,15 +21,20 @@ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
GNU General Public License for more details.
You should have received a copy of the GNU General Public License
-along with GNU Emacs; see the file COPYING. If not, write to
-the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
-Boston, MA 02110-1301, USA. */
+along with GNU Emacs. If not, see . */
#include
#include "lisp.h"
#include "buffer.h"
#include "character.h"
+#include "coding.h"
#include "intervals.h"
+#include "window.h"
+#include "frame.h"
+#include "dispextern.h"
+#include "font.h"
+#include "termhooks.h"
+
/* Emacs uses special text property `composition' to support character
composition. A sequence of characters that have the same (i.e. eq)
@@ -152,11 +158,13 @@ Lisp_Object Vcompose_chars_after_function;
Lisp_Object Qauto_composed;
Lisp_Object Vauto_composition_function;
Lisp_Object Qauto_composition_function;
+Lisp_Object Vcomposition_function_table;
EXFUN (Fremove_list_of_text_properties, 4);
/* Temporary variable used in macros COMPOSITION_XXX. */
Lisp_Object composition_temp;
+
/* Return COMPOSITION-ID of a composition at buffer position
CHARPOS/BYTEPOS and length NCHARS. The `composition' property of
@@ -272,7 +280,19 @@ get_composition_id (charpos, bytepos, nchars, prop, string)
/* Check if the contents of COMPONENTS are valid if COMPONENTS is a
vector or a list. It should be a sequence of:
char1 rule1 char2 rule2 char3 ... ruleN charN+1 */
- if (VECTORP (components) || CONSP (components))
+
+ if (VECTORP (components)
+ && ASIZE (components) >= 2
+ && VECTORP (AREF (components, 0)))
+ {
+ /* COMPONENTS is a glyph-string. */
+ int len = ASIZE (key);
+
+ for (i = 1; i < len; i++)
+ if (! VECTORP (AREF (key, i)))
+ goto invalid_composition;
+ }
+ else if (VECTORP (components) || CONSP (components))
{
int len = XVECTOR (key)->size;
@@ -313,7 +333,6 @@ get_composition_id (charpos, bytepos, nchars, prop, string)
cmp->offsets = (short *) xmalloc (sizeof (short) * glyph_len * 2);
cmp->font = NULL;
- /* Calculate the width of overall glyphs of the composition. */
if (cmp->method != COMPOSITION_WITH_RULE_ALTCHARS)
{
/* Relative composition. */
@@ -322,7 +341,7 @@ get_composition_id (charpos, bytepos, nchars, prop, string)
{
int this_width;
ch = XINT (key_contents[i]);
- this_width = CHAR_WIDTH (ch);
+ this_width = (ch == '\t' ? 1 : CHAR_WIDTH (ch));
if (cmp->width < this_width)
cmp->width = this_width;
}
@@ -333,7 +352,7 @@ get_composition_id (charpos, bytepos, nchars, prop, string)
float leftmost = 0.0, rightmost;
ch = XINT (key_contents[0]);
- rightmost = CHAR_WIDTH (ch);
+ rightmost = ch != '\t' ? CHAR_WIDTH (ch) : 1;
for (i = 1; i < glyph_len; i += 2)
{
@@ -343,7 +362,7 @@ get_composition_id (charpos, bytepos, nchars, prop, string)
rule = XINT (key_contents[i]);
ch = XINT (key_contents[i + 1]);
- this_width = CHAR_WIDTH (ch);
+ this_width = ch != '\t' ? CHAR_WIDTH (ch) : 1;
/* A composition rule is specified by an integer value
that encodes global and new reference points (GREF and
@@ -386,8 +405,8 @@ get_composition_id (charpos, bytepos, nchars, prop, string)
}
-/* Find a composition at or nearest to position POS of OBJECT (buffer
- or string).
+/* Find a static composition at or nearest to position POS of OBJECT
+ (buffer or string).
OBJECT defaults to the current buffer. If there's a composition at
POS, set *START and *END to the start and end of the sequence,
@@ -504,7 +523,8 @@ update_compositions (from, to, check_mask)
avoid it, in such a case, we change the property of the
latter to the copy of it. */
if (from > BEGV
- && find_composition (from - 1, -1, &start, &end, &prop, Qnil))
+ && find_composition (from - 1, -1, &start, &end, &prop, Qnil)
+ && COMPOSITION_VALID_P (start, end, prop))
{
min_pos = start;
if (end > to)
@@ -517,7 +537,8 @@ update_compositions (from, to, check_mask)
from = end;
}
else if (from < ZV
- && find_composition (from, -1, &start, &from, &prop, Qnil))
+ && find_composition (from, -1, &start, &from, &prop, Qnil)
+ && COMPOSITION_VALID_P (start, from, prop))
{
if (from > to)
max_pos = from;
@@ -532,6 +553,7 @@ update_compositions (from, to, check_mask)
(to - 1). */
while (from < to - 1
&& find_composition (from, to, &start, &from, &prop, Qnil)
+ && COMPOSITION_VALID_P (start, from, prop)
&& from < to - 1)
run_composition_function (start, from, prop);
}
@@ -539,7 +561,8 @@ update_compositions (from, to, check_mask)
if (check_mask & CHECK_TAIL)
{
if (from < to
- && find_composition (to - 1, -1, &start, &end, &prop, Qnil))
+ && find_composition (to - 1, -1, &start, &end, &prop, Qnil)
+ && COMPOSITION_VALID_P (start, end, prop))
{
/* TO should be also at composition boundary. But,
insertion or deletion will make two compositions adjacent
@@ -556,7 +579,8 @@ update_compositions (from, to, check_mask)
run_composition_function (start, end, prop);
}
else if (to < ZV
- && find_composition (to, -1, &start, &end, &prop, Qnil))
+ && find_composition (to, -1, &start, &end, &prop, Qnil)
+ && COMPOSITION_VALID_P (start, end, prop))
{
run_composition_function (start, end, prop);
max_pos = end;
@@ -619,6 +643,901 @@ compose_text (start, end, components, modification_func, string)
Fput_text_property (make_number (start), make_number (end),
Qcomposition, prop, string);
}
+
+
+static Lisp_Object autocmp_chars P_ ((Lisp_Object, EMACS_INT, EMACS_INT,
+ EMACS_INT, struct window *,
+ struct face *, Lisp_Object));
+
+
+/* Lisp glyph-string handlers */
+
+/* Hash table for automatic composition. The key is a header of a
+ lgstring (Lispy glyph-string), and the value is a body of a
+ lgstring. */
+
+static Lisp_Object gstring_hash_table;
+
+static Lisp_Object gstring_lookup_cache P_ ((Lisp_Object));
+
+static Lisp_Object
+gstring_lookup_cache (header)
+ Lisp_Object header;
+{
+ struct Lisp_Hash_Table *h = XHASH_TABLE (gstring_hash_table);
+ int i = hash_lookup (h, header, NULL);
+
+ return (i >= 0 ? HASH_VALUE (h, i) : Qnil);
+}
+
+Lisp_Object
+composition_gstring_put_cache (gstring, len)
+ Lisp_Object gstring;
+ int len;
+{
+ struct Lisp_Hash_Table *h = XHASH_TABLE (gstring_hash_table);
+ unsigned hash;
+ Lisp_Object header, copy;
+ int i;
+
+ header = LGSTRING_HEADER (gstring);
+ hash = h->hashfn (h, header);
+ if (len < 0)
+ {
+ len = LGSTRING_GLYPH_LEN (gstring);
+ for (i = 0; i < len; i++)
+ if (NILP (LGSTRING_GLYPH (gstring, i)))
+ break;
+ len = i;
+ }
+
+ copy = Fmake_vector (make_number (len + 2), Qnil);
+ LGSTRING_SET_HEADER (copy, Fcopy_sequence (header));
+ for (i = 0; i < len; i++)
+ LGSTRING_SET_GLYPH (copy, i, Fcopy_sequence (LGSTRING_GLYPH (gstring, i)));
+ i = hash_put (h, LGSTRING_HEADER (copy), copy, hash);
+ LGSTRING_SET_ID (copy, make_number (i));
+ return copy;
+}
+
+Lisp_Object
+composition_gstring_from_id (id)
+ int id;
+{
+ struct Lisp_Hash_Table *h = XHASH_TABLE (gstring_hash_table);
+
+ return HASH_VALUE (h, id);
+}
+
+static Lisp_Object fill_gstring_header P_ ((Lisp_Object, Lisp_Object,
+ Lisp_Object, Lisp_Object,
+ Lisp_Object));
+
+int
+composition_gstring_p (gstring)
+ Lisp_Object gstring;
+{
+ Lisp_Object header;
+ int i;
+
+ if (! VECTORP (gstring) || ASIZE (gstring) < 2)
+ return 0;
+ header = LGSTRING_HEADER (gstring);
+ if (! VECTORP (header) || ASIZE (header) < 2)
+ return 0;
+ if (! NILP (LGSTRING_FONT (gstring))
+ && (! FONT_OBJECT_P (LGSTRING_FONT (gstring))
+ && ! CODING_SYSTEM_P (LGSTRING_FONT (gstring))))
+ return 0;
+ for (i = 1; i < ASIZE (LGSTRING_HEADER (gstring)); i++)
+ if (! NATNUMP (AREF (LGSTRING_HEADER (gstring), i)))
+ return 0;
+ if (! NILP (LGSTRING_ID (gstring)) && ! NATNUMP (LGSTRING_ID (gstring)))
+ return 0;
+ for (i = 0; i < LGSTRING_GLYPH_LEN (gstring); i++)
+ {
+ Lisp_Object glyph = LGSTRING_GLYPH (gstring, i);
+ if (NILP (glyph))
+ break;
+ if (! VECTORP (glyph) || ASIZE (glyph) != LGLYPH_SIZE)
+ return 0;
+ }
+ return 1;
+}
+
+int
+composition_gstring_width (gstring, from, to, metrics)
+ Lisp_Object gstring;
+ int from, to;
+ struct font_metrics *metrics;
+{
+ Lisp_Object *glyph;
+ int width = 0;
+
+ if (metrics)
+ {
+ Lisp_Object font_object = LGSTRING_FONT (gstring);
+
+ if (FONT_OBJECT_P (font_object))
+ {
+ struct font *font = XFONT_OBJECT (font_object);
+
+ metrics->ascent = font->ascent;
+ metrics->descent = font->descent;
+ }
+ else
+ {
+ metrics->ascent = 1;
+ metrics->descent = 0;
+ }
+ metrics->width = metrics->lbearing = metrics->rbearing = 0;
+ }
+ for (glyph = &LGSTRING_GLYPH (gstring, from); from < to; from++, glyph++)
+ {
+ int x;
+
+ if (NILP (LGLYPH_ADJUSTMENT (*glyph)))
+ width += LGLYPH_WIDTH (*glyph);
+ else
+ width += LGLYPH_WADJUST (*glyph);
+ if (metrics)
+ {
+ x = metrics->width + LGLYPH_LBEARING (*glyph) + LGLYPH_XOFF (*glyph);
+ if (metrics->lbearing > x)
+ metrics->lbearing = x;
+ x = metrics->width + LGLYPH_RBEARING (*glyph) + LGLYPH_XOFF (*glyph);
+ if (metrics->rbearing < x)
+ metrics->rbearing = x;
+ metrics->width = width;
+ x = LGLYPH_ASCENT (*glyph) - LGLYPH_YOFF (*glyph);
+ if (metrics->ascent < x)
+ metrics->ascent = x;
+ x = LGLYPH_DESCENT (*glyph) - LGLYPH_YOFF (*glyph);
+ if (metrics->descent < x)
+ metrics->descent = x;
+ }
+ }
+ return width;
+}
+
+
+static Lisp_Object gstring_work;
+static Lisp_Object gstring_work_headers;
+
+static Lisp_Object
+fill_gstring_header (header, start, end, font_object, string)
+ Lisp_Object header, start, end, font_object, string;
+{
+ EMACS_INT from, to, from_byte;
+ EMACS_INT len, i;
+
+ if (NILP (string))
+ {
+ if (NILP (current_buffer->enable_multibyte_characters))
+ error ("Attempt to shape unibyte text");
+ validate_region (&start, &end);
+ from = XFASTINT (start);
+ to = XFASTINT (end);
+ from_byte = CHAR_TO_BYTE (from);
+ }
+ else
+ {
+ CHECK_STRING (string);
+ if (! STRING_MULTIBYTE (string))
+ error ("Attempt to shape unibyte text");
+ /* FROM and TO are checked by the caller. */
+ from = XINT (start);
+ to = XINT (end);
+ if (from < 0 || from > to || to > SCHARS (string))
+ args_out_of_range_3 (string, start, end);
+ from_byte = string_char_to_byte (string, from);
+ }
+
+ len = to - from;
+ if (len == 0)
+ error ("Attempt to shape zero-length text");
+ if (VECTORP (header))
+ {
+ if (ASIZE (header) != len + 1)
+ args_out_of_range (header, make_number (len + 1));
+ }
+ else
+ {
+ if (len <= 8)
+ header = AREF (gstring_work_headers, len - 1);
+ else
+ header = Fmake_vector (make_number (len + 1), Qnil);
+ }
+
+ ASET (header, 0, font_object);
+ for (i = 0; i < len; i++)
+ {
+ int c;
+
+ if (NILP (string))
+ FETCH_CHAR_ADVANCE_NO_CHECK (c, from, from_byte);
+ else
+ FETCH_STRING_CHAR_ADVANCE_NO_CHECK (c, string, from, from_byte);
+ ASET (header, i + 1, make_number (c));
+ }
+ return header;
+}
+
+extern void font_fill_lglyph_metrics P_ ((Lisp_Object, Lisp_Object));
+
+static void
+fill_gstring_body (gstring)
+ Lisp_Object gstring;
+{
+ Lisp_Object font_object = LGSTRING_FONT (gstring);
+ Lisp_Object header = AREF (gstring, 0);
+ EMACS_INT len = LGSTRING_CHAR_LEN (gstring);
+ EMACS_INT i;
+
+ for (i = 0; i < len; i++)
+ {
+ Lisp_Object g = LGSTRING_GLYPH (gstring, i);
+ EMACS_INT c = XINT (AREF (header, i + 1));
+
+ if (NILP (g))
+ {
+ g = LGLYPH_NEW ();
+ LGSTRING_SET_GLYPH (gstring, i, g);
+ }
+ LGLYPH_SET_FROM (g, i);
+ LGLYPH_SET_TO (g, i);
+ LGLYPH_SET_CHAR (g, c);
+ if (FONT_OBJECT_P (font_object))
+ {
+ font_fill_lglyph_metrics (g, font_object);
+ }
+ else
+ {
+ int width = XFASTINT (CHAR_TABLE_REF (Vchar_width_table, c));
+
+ LGLYPH_SET_CODE (g, c);
+ LGLYPH_SET_LBEARING (g, 0);
+ LGLYPH_SET_RBEARING (g, width);
+ LGLYPH_SET_WIDTH (g, width);
+ LGLYPH_SET_ASCENT (g, 1);
+ LGLYPH_SET_DESCENT (g, 0);
+ }
+ LGLYPH_SET_ADJUSTMENT (g, Qnil);
+ }
+ if (i < LGSTRING_GLYPH_LEN (gstring))
+ LGSTRING_SET_GLYPH (gstring, i, Qnil);
+}
+
+EXFUN (Fre_search_forward, 4);
+
+/* Try to compose the characters at CHARPOS according to CFT_ELEMENT
+ which is an element of composition-fucntion-table (which see).
+ LIMIT limits the characters to compose. STRING, if not nil, is a
+ target string. WIN is a window where the characters are being
+ displayed. */
+
+static Lisp_Object
+autocmp_chars (cft_element, charpos, bytepos, limit, win, face, string)
+ Lisp_Object cft_element;
+ EMACS_INT charpos, bytepos, limit;
+ struct window *win;
+ struct face *face;
+ Lisp_Object string;
+{
+ int count = SPECPDL_INDEX ();
+ FRAME_PTR f = XFRAME (win->frame);
+ Lisp_Object pos = make_number (charpos);
+ EMACS_INT pt = PT, pt_byte = PT_BYTE;
+ int lookback;
+
+ record_unwind_save_match_data ();
+ for (lookback = -1; CONSP (cft_element); cft_element = XCDR (cft_element))
+ {
+ Lisp_Object elt = XCAR (cft_element);
+ Lisp_Object re;
+ Lisp_Object font_object = Qnil, gstring;
+ EMACS_INT to;
+
+ if (! VECTORP (elt) || ASIZE (elt) != 3)
+ continue;
+ if (lookback < 0)
+ lookback = XFASTINT (AREF (elt, 1));
+ else if (lookback != XFASTINT (AREF (elt, 1)))
+ break;
+ re = AREF (elt, 0);
+ if (NILP (string))
+ TEMP_SET_PT_BOTH (charpos, bytepos);
+ if (NILP (re)
+ || (STRINGP (re)
+ && (STRINGP (string)
+ ? EQ (Fstring_match (re, string, pos), pos)
+ : (! NILP (Fre_search_forward (re, make_number (limit), Qt, Qnil))
+ && EQ (Fmatch_beginning (make_number (0)), pos)))))
+ {
+ to = (NILP (re) ? charpos + 1 : XINT (Fmatch_end (make_number (0))));
+#ifdef HAVE_WINDOW_SYSTEM
+ if (FRAME_WINDOW_P (f))
+ {
+ font_object = font_range (charpos, &to, win, face, string);
+ if (! FONT_OBJECT_P (font_object))
+ {
+ if (NILP (string))
+ TEMP_SET_PT_BOTH (pt, pt_byte);
+ return unbind_to (count, Qnil);
+ }
+ }
+ else
+#endif /* not HAVE_WINDOW_SYSTEM */
+ font_object = win->frame;
+ gstring = Fcomposition_get_gstring (pos, make_number (to),
+ font_object, string);
+ if (NILP (LGSTRING_ID (gstring)))
+ {
+ Lisp_Object args[6];
+
+ args[0] = Vauto_composition_function;
+ args[1] = AREF (elt, 2);
+ args[2] = pos;
+ args[3] = make_number (to);
+ args[4] = font_object;
+ args[5] = string;
+ gstring = safe_call (6, args);
+ }
+ if (NILP (string))
+ TEMP_SET_PT_BOTH (pt, pt_byte);
+ return unbind_to (count, gstring);
+ }
+ }
+ if (NILP (string))
+ TEMP_SET_PT_BOTH (pt, pt_byte);
+ return unbind_to (count, Qnil);
+}
+
+
+/* Update cmp_it->stop_pos to the next position after CHARPOS (and
+ BYTEPOS) where character composition may happen. If BYTEPOS is
+ negative, compoute it. If it is a static composition, set
+ cmp_it->ch to -1. Otherwise, set cmp_it->ch to the character that
+ triggers a automatic composition. */
+
+void
+composition_compute_stop_pos (cmp_it, charpos, bytepos, endpos, string)
+ struct composition_it *cmp_it;
+ EMACS_INT charpos, bytepos, endpos;
+ Lisp_Object string;
+{
+ EMACS_INT start, end, c;
+ Lisp_Object prop, val;
+ /* This is from forward_to_next_line_start in xdisp.c. */
+ const int MAX_NEWLINE_DISTANCE = 500;
+
+ if (endpos > charpos + MAX_NEWLINE_DISTANCE)
+ endpos = charpos + MAX_NEWLINE_DISTANCE;
+ cmp_it->stop_pos = endpos;
+ cmp_it->id = -1;
+ cmp_it->ch = -2;
+ if (find_composition (charpos, endpos, &start, &end, &prop, string)
+ && COMPOSITION_VALID_P (start, end, prop))
+ {
+ cmp_it->stop_pos = endpos = start;
+ cmp_it->ch = -1;
+ }
+ if (NILP (string) && PT > charpos && PT < endpos)
+ cmp_it->stop_pos = PT;
+ if (NILP (current_buffer->enable_multibyte_characters)
+ || ! FUNCTIONP (Vauto_composition_function))
+ return;
+ if (bytepos < 0)
+ {
+ if (STRINGP (string))
+ bytepos = string_char_to_byte (string, charpos);
+ else
+ bytepos = CHAR_TO_BYTE (charpos);
+ }
+
+ start = charpos;
+ while (charpos < endpos)
+ {
+ if (STRINGP (string))
+ FETCH_STRING_CHAR_ADVANCE (c, string, charpos, bytepos);
+ else
+ FETCH_CHAR_ADVANCE (c, charpos, bytepos);
+ if (c == '\n')
+ {
+ cmp_it->ch = -2;
+ break;
+ }
+ val = CHAR_TABLE_REF (Vcomposition_function_table, c);
+ if (! NILP (val))
+ {
+ Lisp_Object elt;
+
+ for (; CONSP (val); val = XCDR (val))
+ {
+ elt = XCAR (val);
+ if (VECTORP (elt) && ASIZE (elt) == 3 && NATNUMP (AREF (elt, 1))
+ && charpos - 1 - XFASTINT (AREF (elt, 1)) >= start)
+ break;
+ }
+ if (CONSP (val))
+ {
+ cmp_it->lookback = XFASTINT (AREF (elt, 1));
+ cmp_it->stop_pos = charpos - 1 - cmp_it->lookback;
+ cmp_it->ch = c;
+ return;
+ }
+ }
+ }
+ cmp_it->stop_pos = charpos;
+}
+
+/* Check if the character at CHARPOS (and BYTEPOS) is composed
+ (possibly with the following characters) on window W. ENDPOS limits
+ characters to be composed. FACE, in non-NULL, is a base face of
+ the character. If STRING is not nil, it is a string containing the
+ character to check, and CHARPOS and BYTEPOS are indices in the
+ string. In that case, FACE must not be NULL.
+
+ If the character is composed, setup members of CMP_IT (id, nglyphs,
+ and from), and return 1. Otherwise, update CMP_IT->stop_pos, and
+ return 0. */
+
+int
+composition_reseat_it (cmp_it, charpos, bytepos, endpos, w, face, string)
+ struct composition_it *cmp_it;
+ EMACS_INT charpos, bytepos, endpos;
+ struct window *w;
+ struct face *face;
+ Lisp_Object string;
+{
+ if (cmp_it->ch == -2)
+ {
+ composition_compute_stop_pos (cmp_it, charpos, bytepos, endpos, string);
+ if (cmp_it->ch == -2)
+ return 0;
+ }
+
+ if (cmp_it->ch < 0)
+ {
+ /* We are looking at a static composition. */
+ EMACS_INT start, end;
+ Lisp_Object prop;
+
+ find_composition (charpos, -1, &start, &end, &prop, string);
+ cmp_it->id = get_composition_id (charpos, bytepos, end - start,
+ prop, string);
+ if (cmp_it->id < 0)
+ goto no_composition;
+ cmp_it->nchars = end - start;
+ cmp_it->nglyphs = composition_table[cmp_it->id]->glyph_len;
+ }
+ else if (w)
+ {
+ Lisp_Object val, elt;
+ int i;
+
+ val = CHAR_TABLE_REF (Vcomposition_function_table, cmp_it->ch);
+ for (; CONSP (val); val = XCDR (val))
+ {
+ elt = XCAR (val);
+ if (cmp_it->lookback == XFASTINT (AREF (elt, 1)))
+ break;
+ }
+ if (NILP (val))
+ goto no_composition;
+
+ val = autocmp_chars (val, charpos, bytepos, endpos, w, face, string);
+ if (! composition_gstring_p (val))
+ goto no_composition;
+ if (NILP (LGSTRING_ID (val)))
+ val = composition_gstring_put_cache (val, -1);
+ cmp_it->id = XINT (LGSTRING_ID (val));
+ for (i = 0; i < LGSTRING_GLYPH_LEN (val); i++)
+ if (NILP (LGSTRING_GLYPH (val, i)))
+ break;
+ cmp_it->nglyphs = i;
+ }
+ else
+ goto no_composition;
+ cmp_it->from = 0;
+ return 1;
+
+ no_composition:
+ charpos++;
+ if (STRINGP (string))
+ bytepos += MULTIBYTE_LENGTH_NO_CHECK (SDATA (string) + bytepos);
+ else
+ INC_POS (bytepos);
+ composition_compute_stop_pos (cmp_it, charpos, bytepos, endpos, string);
+ return 0;
+}
+
+int
+composition_update_it (cmp_it, charpos, bytepos, string)
+ struct composition_it *cmp_it;
+ EMACS_INT charpos, bytepos;
+ Lisp_Object string;
+{
+ int i, c;
+
+ if (cmp_it->ch < 0)
+ {
+ struct composition *cmp = composition_table[cmp_it->id];
+
+ cmp_it->to = cmp_it->nglyphs;
+ if (cmp_it->nglyphs == 0)
+ c = -1;
+ else
+ {
+ for (i = 0; i < cmp->glyph_len; i++)
+ if ((c = COMPOSITION_GLYPH (cmp, i)) != '\t')
+ break;
+ if (c == '\t')
+ c = ' ';
+ }
+ cmp_it->width = cmp->width;
+ }
+ else
+ {
+ Lisp_Object gstring = composition_gstring_from_id (cmp_it->id);
+
+ if (cmp_it->nglyphs == 0)
+ {
+ c = -1;
+ cmp_it->nchars = LGSTRING_CHAR_LEN (gstring);
+ cmp_it->width = 0;
+ }
+ else
+ {
+ Lisp_Object glyph = LGSTRING_GLYPH (gstring, cmp_it->from);
+ int from = LGLYPH_FROM (glyph);
+
+ c = XINT (LGSTRING_CHAR (gstring, from));
+ cmp_it->nchars = LGLYPH_TO (glyph) - from + 1;
+ cmp_it->width = (LGLYPH_WIDTH (glyph) > 0
+ ? CHAR_WIDTH (LGLYPH_CHAR (glyph)) : 0);
+ for (cmp_it->to = cmp_it->from + 1; cmp_it->to < cmp_it->nglyphs;
+ cmp_it->to++)
+ {
+ glyph = LGSTRING_GLYPH (gstring, cmp_it->to);
+ if (LGLYPH_FROM (glyph) != from)
+ break;
+ if (LGLYPH_WIDTH (glyph) > 0)
+ cmp_it->width += CHAR_WIDTH (LGLYPH_CHAR (glyph));
+ }
+ }
+ }
+
+ charpos += cmp_it->nchars;
+ if (STRINGP (string))
+ cmp_it->nbytes = string_char_to_byte (string, charpos) - bytepos;
+ else
+ cmp_it->nbytes = CHAR_TO_BYTE (charpos) - bytepos;
+ return c;
+}
+
+
+struct position_record
+{
+ EMACS_INT pos, pos_byte;
+ unsigned char *p;
+};
+
+/* Update the members of POSTION to the next character boundary. */
+#define FORWARD_CHAR(POSITION, STOP) \
+ do { \
+ (POSITION).pos++; \
+ if ((POSITION).pos == (STOP)) \
+ { \
+ (POSITION).p = GAP_END_ADDR; \
+ (POSITION).pos_byte = GPT_BYTE; \
+ } \
+ else \
+ { \
+ (POSITION).pos_byte += BYTES_BY_CHAR_HEAD (*((POSITION).p)); \
+ (POSITION).p += BYTES_BY_CHAR_HEAD (*((POSITION).p)); \
+ } \
+ } while (0)
+
+/* Update the members of POSTION to the previous character boundary. */
+#define BACKWARD_CHAR(POSITION, STOP) \
+ do { \
+ if ((POSITION).pos == STOP) \
+ (POSITION).p = GPT_ADDR; \
+ do { \
+ (POSITION).pos_byte--; \
+ (POSITION).p--; \
+ } while (! CHAR_HEAD_P (*((POSITION).p))); \
+ (POSITION).pos--; \
+ } while (0)
+
+static Lisp_Object _work_val;
+static int _work_char;
+
+/* 1 iff the character C is composable. */
+#define CHAR_COMPOSABLE_P(C) \
+ (_work_val = CHAR_TABLE_REF (Vunicode_category_table, (C)), \
+ (SYMBOLP (_work_val) \
+ && (_work_char = SDATA (SYMBOL_NAME (_work_val))[0]) != 'C' \
+ && _work_char != 'Z'))
+
+/* This is like find_composition, but find an automatic composition
+ instead. If found, set *GSTRING to the glyph-string representing
+ the composition, and return 1. Otherwise, return 0. */
+
+static int
+find_automatic_composition (pos, limit, start, end, gstring, string)
+ EMACS_INT pos, limit, *start, *end;
+ Lisp_Object *gstring, string;
+{
+ EMACS_INT head, tail, stop;
+ struct position_record orig, cur, check, prev;
+ Lisp_Object check_val, val, elt;
+ int check_lookback;
+ int c;
+ Lisp_Object window;
+ struct window *w;
+
+ window = Fget_buffer_window (Fcurrent_buffer (), Qnil);
+ if (NILP (window))
+ return 0;
+ w = XWINDOW (window);
+
+ orig.pos = pos;
+ if (NILP (string))
+ {
+ head = BEGV, tail = ZV, stop = GPT;
+ orig.pos_byte = CHAR_TO_BYTE (orig.pos);
+ orig.p = BYTE_POS_ADDR (orig.pos_byte);
+ }
+ else
+ {
+ head = 0, tail = SCHARS (string), stop = -1;
+ orig.pos_byte = string_char_to_byte (string, orig.pos);
+ orig.p = SDATA (string) + orig.pos_byte;
+ }
+ if (limit < pos)
+ {
+ head = max (head, limit);
+ tail = min (tail, pos + 3);
+ }
+ else
+ {
+ tail = min (tail, limit + 3);
+ }
+ cur = orig;
+
+ retry:
+ check_val = Qnil;
+ /* At first, check if POS is compoable. */
+ c = STRING_CHAR (cur.p, 0);
+ if (! CHAR_COMPOSABLE_P (c))
+ {
+ if (limit < 0)
+ return 0;
+ if (limit >= cur.pos)
+ goto search_forward;
+ }
+ else
+ {
+ val = CHAR_TABLE_REF (Vcomposition_function_table, c);
+ if (! NILP (val))
+ check_val = val, check = cur;
+ else
+ while (cur.pos + 1 < tail)
+ {
+ FORWARD_CHAR (cur, stop);
+ c = STRING_CHAR (cur.p, 0);
+ if (! CHAR_COMPOSABLE_P (c))
+ break;
+ val = CHAR_TABLE_REF (Vcomposition_function_table, c);
+ if (NILP (val))
+ continue;
+ check_val = val, check = cur;
+ break;
+ }
+ cur = orig;
+ }
+ /* Rewind back to the position where we can safely search forward
+ for compositions. */
+ while (cur.pos > head)
+ {
+ BACKWARD_CHAR (cur, stop);
+ c = STRING_CHAR (cur.p, 0);
+ if (! CHAR_COMPOSABLE_P (c))
+ break;
+ val = CHAR_TABLE_REF (Vcomposition_function_table, c);
+ if (! NILP (val))
+ check_val = val, check = cur;
+ }
+ prev = cur;
+ /* Now search forward. */
+ search_forward:
+ *gstring = Qnil;
+ if (! NILP (check_val) || limit >= orig.pos)
+ {
+ if (NILP (check_val))
+ cur = orig;
+ else
+ cur = check;
+ while (cur.pos < tail)
+ {
+ int need_adjustment = 0;
+
+ if (NILP (check_val))
+ {
+ c = STRING_CHAR (cur.p, 0);
+ check_val = CHAR_TABLE_REF (Vcomposition_function_table, c);
+ }
+ for (; CONSP (check_val); check_val = XCDR (check_val))
+ {
+ elt = XCAR (check_val);
+ if (VECTORP (elt) && ASIZE (elt) == 3 && NATNUMP (AREF (elt, 1))
+ && cur.pos - XFASTINT (AREF (elt, 1)) >= head)
+ {
+ check.pos = cur.pos - XFASTINT (AREF (elt, 1));
+ if (check.pos == cur.pos)
+ check.pos_byte = cur.pos_byte;
+ else
+ check.pos_byte = CHAR_TO_BYTE (check.pos);
+ val = autocmp_chars (check_val, check.pos, check.pos_byte,
+ tail, w, NULL, string);
+ need_adjustment = 1;
+ if (! NILP (val))
+ {
+ *gstring = val;
+ *start = check.pos;
+ *end = check.pos + LGSTRING_CHAR_LEN (*gstring);
+ if (*start <= orig.pos ? *end > orig.pos
+ : limit >= orig.pos)
+ return 1;
+ cur.pos = *end;
+ cur.pos_byte = CHAR_TO_BYTE (cur.pos);
+ break;
+ }
+ }
+ }
+ if (need_adjustment)
+ {
+ /* As we have called Lisp, there's a possibilily that
+ buffer/string is relocated. */
+ if (NILP (string))
+ cur.p = BYTE_POS_ADDR (cur.pos_byte);
+ else
+ cur.p = SDATA (string) + cur.pos_byte;
+ }
+ if (! CONSP (check_val))
+ FORWARD_CHAR (cur, stop);
+ check_val = Qnil;
+ }
+ }
+ if (! NILP (*gstring))
+ return (limit >= 0 || (*start <= orig.pos && *end > orig.pos));
+ if (limit >= 0 && limit < orig.pos && prev.pos > head)
+ {
+ cur = prev;
+ BACKWARD_CHAR (cur, stop);
+ orig = cur;
+ tail = orig.pos;
+ goto retry;
+ }
+ return 0;
+}
+
+int
+composition_adjust_point (last_pt)
+ EMACS_INT last_pt;
+{
+ EMACS_INT charpos, bytepos, startpos, beg, end, pos;
+ Lisp_Object val;
+ int i;
+
+ if (PT == BEGV || PT == ZV)
+ return PT;
+
+ /* At first check the static composition. */
+ if (get_property_and_range (PT, Qcomposition, &val, &beg, &end, Qnil)
+ && COMPOSITION_VALID_P (beg, end, val)
+ && beg < PT /* && end > PT <- It's always the case. */
+ && (last_pt <= beg || last_pt >= end))
+ return (PT < last_pt ? beg : end);
+
+ if (NILP (current_buffer->enable_multibyte_characters)
+ || ! FUNCTIONP (Vauto_composition_function))
+ return PT;
+
+ /* Next check the automatic composition. */
+ if (! find_automatic_composition (PT, (EMACS_INT) -1, &beg, &end, &val, Qnil)
+ || beg == PT)
+ return PT;
+ for (i = 0; i < LGSTRING_GLYPH_LEN (val); i++)
+ {
+ Lisp_Object glyph = LGSTRING_GLYPH (val, i);
+
+ if (NILP (glyph))
+ break;
+ if (beg + LGLYPH_FROM (glyph) == PT)
+ return PT;
+ if (beg + LGLYPH_TO (glyph) >= PT)
+ return (PT < last_pt
+ ? beg + LGLYPH_FROM (glyph)
+ : beg + LGLYPH_TO (glyph) + 1);
+ }
+ return PT;
+}
+
+DEFUN ("composition-get-gstring", Fcomposition_get_gstring,
+ Scomposition_get_gstring, 4, 4, 0,
+ doc: /* Return a glyph-string for characters between FROM and TO.
+If the glyph string is for graphic display, FONT-OBJECT must be
+a font-object to use for those characters.
+Otherwise (for terminal display), FONT-OBJECT must be a terminal ID, a
+frame, or nil for the selected frame's terminal device.
+
+If the optional 4th argument STRING is not nil, it is a string
+containing the target characters between indices FROM and TO.
+
+A glyph-string is a vector containing information about how to display
+a specific character sequence. The format is:
+ [HEADER ID GLYPH ...]
+
+HEADER is a vector of this form:
+ [FONT-OBJECT CHAR ...]
+where
+ FONT-OBJECT is a font-object for all glyphs in the glyph-string,
+ or the terminal coding system of the specified terminal.
+ CHARs are characters to be composed by GLYPHs.
+
+ID is an identification number of the glyph-string. It may be nil if
+not yet shaped.
+
+GLYPH is a vector whose elements have this form:
+ [ FROM-IDX TO-IDX C CODE WIDTH LBEARING RBEARING ASCENT DESCENT
+ [ [X-OFF Y-OFF WADJUST] | nil] ]
+where
+ FROM-IDX and TO-IDX are used internally and should not be touched.
+ C is the character of the glyph.
+ CODE is the glyph-code of C in FONT-OBJECT.
+ WIDTH thru DESCENT are the metrics (in pixels) of the glyph.
+ X-OFF and Y-OFF are offsets to the base position for the glyph.
+ WADJUST is the adjustment to the normal width of the glyph.
+
+If GLYPH is nil, the remaining elements of the glyph-string vector
+should be ignored. */)
+ (from, to, font_object, string)
+ Lisp_Object font_object, from, to, string;
+{
+ Lisp_Object gstring, header;
+ EMACS_INT frompos, topos;
+
+ CHECK_NATNUM (from);
+ CHECK_NATNUM (to);
+ if (! FONT_OBJECT_P (font_object))
+ {
+ struct coding_system *coding;
+ struct terminal *terminal = get_terminal (font_object, 1);
+
+ coding = ((TERMINAL_TERMINAL_CODING (terminal)->common_flags
+ & CODING_REQUIRE_ENCODING_MASK)
+ ? TERMINAL_TERMINAL_CODING (terminal) : &safe_terminal_coding);
+ font_object = CODING_ID_NAME (coding->id);
+ }
+
+ header = fill_gstring_header (Qnil, from, to, font_object, string);
+ gstring = gstring_lookup_cache (header);
+ if (! NILP (gstring))
+ return gstring;
+
+ frompos = XINT (from);
+ topos = XINT (to);
+ if (LGSTRING_GLYPH_LEN (gstring_work) < topos - frompos)
+ gstring_work = Fmake_vector (make_number (topos - frompos + 2), Qnil);
+ LGSTRING_SET_HEADER (gstring_work, header);
+ LGSTRING_SET_ID (gstring_work, Qnil);
+ fill_gstring_body (gstring_work);
+ return gstring_work;
+}
+
/* Emacs Lisp APIs. */
@@ -628,7 +1547,7 @@ DEFUN ("compose-region-internal", Fcompose_region_internal,
Compose text in the region between START and END.
Optional 3rd and 4th arguments are COMPONENTS and MODIFICATION-FUNC
-for the composition. See `compose-region' for more detail. */)
+for the composition. See `compose-region' for more details. */)
(start, end, components, modification_func)
Lisp_Object start, end, components, modification_func;
{
@@ -649,7 +1568,7 @@ DEFUN ("compose-string-internal", Fcompose_string_internal,
Compose text between indices START and END of STRING.
Optional 4th and 5th arguments are COMPONENTS and MODIFICATION-FUNC
-for the composition. See `compose-string' for more detail. */)
+for the composition. See `compose-string' for more details. */)
(string, start, end, components, modification_func)
Lisp_Object string, start, end, components, modification_func;
{
@@ -671,23 +1590,23 @@ DEFUN ("find-composition-internal", Ffind_composition_internal,
doc: /* Internal use only.
Return information about composition at or nearest to position POS.
-See `find-composition' for more detail. */)
+See `find-composition' for more details. */)
(pos, limit, string, detail_p)
Lisp_Object pos, limit, string, detail_p;
{
- Lisp_Object prop, tail;
- EMACS_INT start, end;
+ Lisp_Object prop, tail, gstring;
+ EMACS_INT start, end, from, to;
int id;
CHECK_NUMBER_COERCE_MARKER (pos);
- start = XINT (pos);
+ from = XINT (pos);
if (!NILP (limit))
{
CHECK_NUMBER_COERCE_MARKER (limit);
- end = XINT (limit);
+ to = XINT (limit);
}
else
- end = -1;
+ to = -1;
if (!NILP (string))
{
@@ -701,8 +1620,23 @@ See `find-composition' for more detail. */)
args_out_of_range (Fcurrent_buffer (), pos);
}
- if (!find_composition (start, end, &start, &end, &prop, string))
- return Qnil;
+ if (!find_composition (from, to, &start, &end, &prop, string))
+ {
+ if (!NILP (current_buffer->enable_multibyte_characters)
+ && FUNCTIONP (Vauto_composition_function)
+ && find_automatic_composition (from, to, &start, &end, &gstring,
+ string))
+ return list3 (make_number (start), make_number (end), gstring);
+ return Qnil;
+ }
+ if ((end <= XINT (pos) || start > XINT (pos)))
+ {
+ EMACS_INT s, e;
+
+ if (find_automatic_composition (from, to, &s, &e, &gstring, string)
+ && (e <= XINT (pos) ? e > end : s < start))
+ return list3 (make_number (start), make_number (end), gstring);
+ }
if (!COMPOSITION_VALID_P (start, end, prop))
return Fcons (make_number (start), Fcons (make_number (end),
Fcons (Qnil, Qnil)));
@@ -745,10 +1679,12 @@ See `find-composition' for more detail. */)
void
syms_of_composite ()
{
+ int i;
+
Qcomposition = intern ("composition");
staticpro (&Qcomposition);
- /* Make a hash table for composition. */
+ /* Make a hash table for static composition. */
{
Lisp_Object args[6];
extern Lisp_Object QCsize;
@@ -757,7 +1693,7 @@ syms_of_composite ()
args[1] = Qequal;
args[2] = QCweakness;
/* We used to make the hash table weak so that unreferenced
- compostions can be garbage-collected. But, usually once
+ compositions can be garbage-collected. But, usually once
created compositions are repeatedly used in an Emacs session,
and thus it's not worth to save memory in such a way. So, we
make the table not weak. */
@@ -768,6 +1704,28 @@ syms_of_composite ()
staticpro (&composition_hash_table);
}
+ /* Make a hash table for glyph-string. */
+ {
+ Lisp_Object args[6];
+ extern Lisp_Object QCsize;
+
+ args[0] = QCtest;
+ args[1] = Qequal;
+ args[2] = QCweakness;
+ args[3] = Qnil;
+ args[4] = QCsize;
+ args[5] = make_number (311);
+ gstring_hash_table = Fmake_hash_table (6, args);
+ staticpro (&gstring_hash_table);
+ }
+
+ staticpro (&gstring_work_headers);
+ gstring_work_headers = Fmake_vector (make_number (8), Qnil);
+ for (i = 0; i < 8; i++)
+ ASET (gstring_work_headers, i, Fmake_vector (make_number (i + 2), Qnil));
+ staticpro (&gstring_work);
+ gstring_work = Fmake_vector (make_number (10), Qnil);
+
/* Text property `composition' should be nonsticky by default. */
Vtext_property_default_nonsticky
= Fcons (Fcons (Qcomposition, Qt), Vtext_property_default_nonsticky);
@@ -775,8 +1733,8 @@ syms_of_composite ()
DEFVAR_LISP ("compose-chars-after-function", &Vcompose_chars_after_function,
doc: /* Function to adjust composition of buffer text.
-The function is called with three arguments FROM, TO, and OBJECT.
-FROM and TO specify the range of text of which composition should be
+This function is called with three arguments: FROM, TO, and OBJECT.
+FROM and TO specify the range of text whose composition should be
adjusted. OBJECT, if non-nil, is a string that contains the text.
This function is called after a text with `composition' property is
@@ -794,20 +1752,54 @@ The default value is the function `compose-chars-after'. */);
DEFVAR_LISP ("auto-composition-function", &Vauto_composition_function,
doc: /* Function to call to compose characters automatically.
-The function is called from the display routine with two arguments,
-POS and STRING.
+This function is called from the display routine with four arguments:
+FROM, TO, WINDOW, and STRING.
-If STRING is nil, the function must compose characters following POS
-in the current buffer.
+If STRING is nil, the function must compose characters in the region
+between FROM and TO in the current buffer.
-Otherwise, STRING is a string, and POS is an index to the string. In
-this case, the function must compose characters following POS in
-the string. */);
+Otherwise, STRING is a string, and FROM and TO are indices into the
+string. In this case, the function must compose characters in the
+string. */);
Vauto_composition_function = Qnil;
+ DEFVAR_LISP ("composition-function-table", &Vcomposition_function_table,
+ doc: /* Char-table of functions for automatic character composition.
+For each character that has to be composed automatically with
+preceding and/or following characters, this char-table contains
+a function to call to compose that character.
+
+The element at index C in the table, if non-nil, is a list of
+this form: ([PATTERN PREV-CHARS FUNC] ...)
+
+PATTERN is a regular expression which C and the surrounding
+characters must match.
+
+PREV-CHARS is a number of characters before C to check the
+matching with PATTERN. If it is 0, PATTERN must match C and
+the following characters. If it is 1, PATTERN must match a
+character before C and the following characters.
+
+If PREV-CHARS is 0, PATTERN can be nil, which means that the
+single character C should be composed.
+
+FUNC is a function to return a glyph-string representing a
+composition of the characters that match PATTERN. It is
+called with one argument GSTRING.
+
+GSTRING is a template of a glyph-string to return. It is already
+filled with a proper header for the characters to compose, and
+glyphs corresponding to those characters one by one. The
+function must return a new glyph-string with the same header as
+GSTRING, or modify GSTRING itself and return it.
+
+See also the documentation of `auto-composition-mode'. */);
+ Vcomposition_function_table = Fmake_char_table (Qnil, Qnil);
+
defsubr (&Scompose_region_internal);
defsubr (&Scompose_string_internal);
defsubr (&Sfind_composition_internal);
+ defsubr (&Scomposition_get_gstring);
}
/* arch-tag: 79cefaf8-ca48-4eed-97e5-d5afb290d272