From 85da7b57bc204c4cc6953156c1a9a4dc6e875541 Mon Sep 17 00:00:00 2001 From: Eli Zaretskii Date: Wed, 26 May 2021 20:08:47 +0300 Subject: Make 'string-width' auto-composition aware * src/composite.c (find_automatic_composition): Now extern. (char_composable_p): Don't assume 'unicode-category-table' is always available. * src/composite.h (find_automatic_composition): Add prototype. * src/character.c (lisp_string_width): Support automatic compositions; call 'find_automatic_composition' when 'auto-composition-mode' is ON. --- src/composite.h | 4 ++++ 1 file changed, 4 insertions(+) (limited to 'src/composite.h') diff --git a/src/composite.h b/src/composite.h index c5d3c0faabb..75e5f9b9ecb 100644 --- a/src/composite.h +++ b/src/composite.h @@ -320,6 +320,10 @@ extern bool composition_gstring_p (Lisp_Object); extern int composition_gstring_width (Lisp_Object, ptrdiff_t, ptrdiff_t, struct font_metrics *); +extern bool find_automatic_composition (ptrdiff_t, ptrdiff_t, ptrdiff_t *, + ptrdiff_t *, Lisp_Object *, + Lisp_Object); + extern void composition_compute_stop_pos (struct composition_it *, ptrdiff_t, ptrdiff_t, ptrdiff_t, Lisp_Object); -- cgit v1.2.1