(composition-function-table): Declaration moved to composite.c. (terminal-composition-base-character-p): Delete it. (terminal-composition-function): Delete it. (terminal-composition-function-table): Delete it. (lgstring-header, lgstring-set-header, lgstring-font) (lgstring-char, lgstring-char-len, lgstring-shaped-p) (lgstring-set-id, lgstring-glyph, lgstring-glyph-len) (lgstring-set-glyph, lglyph-from, lglyph-to, lglyph-char) (lglyph-code, lglyph-width, lglyph-lbearing, lglyph-rbearing) (lglyph-ascent, lglyph-descent, lglyph-adjustment) (lglyph-set-from-to, lglyph-copy, lgstring-insert-glyph) (compose-glyph-string, compose-glyph-string-relative) (compose-gstring-for-graphic, compose-gstring-for-terminal): New functions. (auto-compose-chars): Argument changed.