From af7e13bde417f7c4bb34ab831670d624cd0e5c44 Mon Sep 17 00:00:00 2001 From: Kenichi Handa Date: Thu, 26 Oct 2006 12:00:59 +0000 Subject: [PATCH] *** empty log message *** --- lisp/ChangeLog.unicode | 7 +++++++ src/ChangeLog.unicode | 11 +++++++++++ src/xdisp.c | 12 +++++++++--- 3 files changed, 27 insertions(+), 3 deletions(-) diff --git a/lisp/ChangeLog.unicode b/lisp/ChangeLog.unicode index 998f374fc53..664f59291a0 100644 --- a/lisp/ChangeLog.unicode +++ b/lisp/ChangeLog.unicode @@ -1,5 +1,12 @@ 2006-10-26 Kenichi Handa + * composite.el (terminal-composition-function): New function. + (terminal-composition-function-table): New variable. + (auto-compose-chars): If running on a terminal, use + terminal-composition-function-table. + + * loadup.el: Load "composite" after "international/characters". + * international/characters.el: Delete codes for setting up charset property nospace-between-words. Fix setting up of char-width-table. Don't make ethiopic and tibetan double column. diff --git a/src/ChangeLog.unicode b/src/ChangeLog.unicode index fcf35e1bdcb..0b9fe23faa8 100644 --- a/src/ChangeLog.unicode +++ b/src/ChangeLog.unicode @@ -1,3 +1,14 @@ +2006-10-26 Kenichi Handa + + * term.c: Include "composite.h". + (encode_terminal_code): Output all components of composition. + Check the size of encode_terminal_src. + (produce_glyphs): For compostion, call produce_composite_glyph. + (append_composite_glyph, produce_composite_glyph): New functions. + + * xdisp.c (x_produce_glyphs): In handling composition, if a font + is not found, get font_info from the current ascii face. + 2006-10-23 Kenichi Handa * fileio.c (Finsert_file_contents): On replacing, temporarily bind diff --git a/src/xdisp.c b/src/xdisp.c index 87f6c49ad36..45deab74599 100644 --- a/src/xdisp.c +++ b/src/xdisp.c @@ -20941,9 +20941,15 @@ x_produce_glyphs (it) /* When no suitable font found, use the default font. */ font_not_found_p = font == NULL; if (font_not_found_p) - font = FACE_FROM_ID (it->f, it->face_id)->font; - font_info - = FONT_INFO_FROM_FACE (it->f, FACE_FROM_ID (it->f, face_id)); + { + font = FACE_FROM_ID (it->f, it->face_id)->font; + font_info + = FONT_INFO_FROM_FACE (it->f, + FACE_FROM_ID (it->f, it->face_id)); + } + else + font_info + = FONT_INFO_FROM_FACE (it->f, FACE_FROM_ID (it->f, face_id)); boff = font_info->baseline_offset; if (font_info->vertical_centering) boff = VCENTER_BASELINE_OFFSET (font, it->f) - boff; -- 2.39.5