annotate lisp/mule/mule-composite-stub.el @ 4745:0c54de4c4b9d

Resolve the unregistered-CCL-programs-get-garbage-collected problem correctly src/ChangeLog addition: 2009-11-15 Aidan Kehoe <kehoea@parhasard.net> * mule-ccl.c (CCL_CALL_FOR_MAP_INSTRUCTION): Assert that we always have a symbol in this macro. (setup_ccl_program): Ensure we're not allocating unreachable memory in this function; all symbols must have been resolved in a given CCL program before this function is called. (find_ccl_program): New function, return a CCL program with all its symbols resolved if it is valid (possibly allocating memory), Qnil otherwise. (get_ccl_program): New function, exported to other files; call find_ccl_program, and error if it gives nil. (Fccl_program_p): Call find_ccl_program from this function instead of implementing the bulk of it here. (Fccl_execute): Call get_ccl_program instead of implementing the bulk of it here. (Fccl_execute_on_string): Ditto. * mule-ccl.h (Vfont_ccl_encoder_alist): Remove this declaration, it hasn't been used in years. (get_ccl_program): Declare this function. * mule-coding.c (ccl_putprop): Use get_ccl_program on any specified encode or decode CCL program property. (fixed_width_putprop): Ditto. * mule-charset.c (Fmake_charset): Use get_ccl_program on any specified ccl-program. (Fset_charset_ccl_program): Ditto.
author Aidan Kehoe <kehoea@parhasard.net>
date Sun, 15 Nov 2009 16:53:14 +0000
parents 2923009caf47
children 308d34e9f07d
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
rev   line source
778
2923009caf47 [xemacs-hg @ 2002-03-16 10:38:59 by ben]
ben
parents:
diff changeset
1 ;;; mule-composite-stub.el --- Stubs of composition support -*- coding: iso-2022-7bit; -*-
2923009caf47 [xemacs-hg @ 2002-03-16 10:38:59 by ben]
ben
parents:
diff changeset
2
2923009caf47 [xemacs-hg @ 2002-03-16 10:38:59 by ben]
ben
parents:
diff changeset
3 ;; Copyright (C) 2002 Ben Wing.
2923009caf47 [xemacs-hg @ 2002-03-16 10:38:59 by ben]
ben
parents:
diff changeset
4
2923009caf47 [xemacs-hg @ 2002-03-16 10:38:59 by ben]
ben
parents:
diff changeset
5 ;; Keywords: multibyte character, composition
2923009caf47 [xemacs-hg @ 2002-03-16 10:38:59 by ben]
ben
parents:
diff changeset
6
2923009caf47 [xemacs-hg @ 2002-03-16 10:38:59 by ben]
ben
parents:
diff changeset
7 ;; This file is part of XEmacs.
2923009caf47 [xemacs-hg @ 2002-03-16 10:38:59 by ben]
ben
parents:
diff changeset
8
2923009caf47 [xemacs-hg @ 2002-03-16 10:38:59 by ben]
ben
parents:
diff changeset
9 ;; XEmacs is free software; you can redistribute it and/or modify it
2923009caf47 [xemacs-hg @ 2002-03-16 10:38:59 by ben]
ben
parents:
diff changeset
10 ;; under the terms of the GNU General Public License as published by
2923009caf47 [xemacs-hg @ 2002-03-16 10:38:59 by ben]
ben
parents:
diff changeset
11 ;; the Free Software Foundation; either version 2, or (at your option)
2923009caf47 [xemacs-hg @ 2002-03-16 10:38:59 by ben]
ben
parents:
diff changeset
12 ;; any later version.
2923009caf47 [xemacs-hg @ 2002-03-16 10:38:59 by ben]
ben
parents:
diff changeset
13
2923009caf47 [xemacs-hg @ 2002-03-16 10:38:59 by ben]
ben
parents:
diff changeset
14 ;; XEmacs is distributed in the hope that it will be useful, but
2923009caf47 [xemacs-hg @ 2002-03-16 10:38:59 by ben]
ben
parents:
diff changeset
15 ;; WITHOUT ANY WARRANTY; without even the implied warranty of
2923009caf47 [xemacs-hg @ 2002-03-16 10:38:59 by ben]
ben
parents:
diff changeset
16 ;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
2923009caf47 [xemacs-hg @ 2002-03-16 10:38:59 by ben]
ben
parents:
diff changeset
17 ;; General Public License for more details.
2923009caf47 [xemacs-hg @ 2002-03-16 10:38:59 by ben]
ben
parents:
diff changeset
18
2923009caf47 [xemacs-hg @ 2002-03-16 10:38:59 by ben]
ben
parents:
diff changeset
19 ;; You should have received a copy of the GNU General Public License
2923009caf47 [xemacs-hg @ 2002-03-16 10:38:59 by ben]
ben
parents:
diff changeset
20 ;; along with XEmacs; see the file COPYING. If not, write to the Free
2923009caf47 [xemacs-hg @ 2002-03-16 10:38:59 by ben]
ben
parents:
diff changeset
21 ;; Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
2923009caf47 [xemacs-hg @ 2002-03-16 10:38:59 by ben]
ben
parents:
diff changeset
22 ;; 02111-1307, USA.
2923009caf47 [xemacs-hg @ 2002-03-16 10:38:59 by ben]
ben
parents:
diff changeset
23
2923009caf47 [xemacs-hg @ 2002-03-16 10:38:59 by ben]
ben
parents:
diff changeset
24 ;;; Synched up with: Emacs 21.1 (src/fontset.c, src/composite.c).
2923009caf47 [xemacs-hg @ 2002-03-16 10:38:59 by ben]
ben
parents:
diff changeset
25
2923009caf47 [xemacs-hg @ 2002-03-16 10:38:59 by ben]
ben
parents:
diff changeset
26 ;;; Commentary:
2923009caf47 [xemacs-hg @ 2002-03-16 10:38:59 by ben]
ben
parents:
diff changeset
27
2923009caf47 [xemacs-hg @ 2002-03-16 10:38:59 by ben]
ben
parents:
diff changeset
28 ;;; Code:
2923009caf47 [xemacs-hg @ 2002-03-16 10:38:59 by ben]
ben
parents:
diff changeset
29
2923009caf47 [xemacs-hg @ 2002-03-16 10:38:59 by ben]
ben
parents:
diff changeset
30 (defvar use-default-ascent (make-char-table 'generic)
2923009caf47 [xemacs-hg @ 2002-03-16 10:38:59 by ben]
ben
parents:
diff changeset
31 "UNIMPLEMENTED.
2923009caf47 [xemacs-hg @ 2002-03-16 10:38:59 by ben]
ben
parents:
diff changeset
32 Char table of characters whose ascent values should be ignored.
2923009caf47 [xemacs-hg @ 2002-03-16 10:38:59 by ben]
ben
parents:
diff changeset
33 If an entry for a character is non-nil, the ascent value of the glyph
2923009caf47 [xemacs-hg @ 2002-03-16 10:38:59 by ben]
ben
parents:
diff changeset
34 is assumed to be what specified by _MULE_DEFAULT_ASCENT property of a font.
2923009caf47 [xemacs-hg @ 2002-03-16 10:38:59 by ben]
ben
parents:
diff changeset
35
2923009caf47 [xemacs-hg @ 2002-03-16 10:38:59 by ben]
ben
parents:
diff changeset
36 This affects how a composite character which contains
2923009caf47 [xemacs-hg @ 2002-03-16 10:38:59 by ben]
ben
parents:
diff changeset
37 such a character is displayed on screen.")
2923009caf47 [xemacs-hg @ 2002-03-16 10:38:59 by ben]
ben
parents:
diff changeset
38
2923009caf47 [xemacs-hg @ 2002-03-16 10:38:59 by ben]
ben
parents:
diff changeset
39 (defvar ignore-relative-composition (make-char-table 'generic)
2923009caf47 [xemacs-hg @ 2002-03-16 10:38:59 by ben]
ben
parents:
diff changeset
40 "UNIMPLEMENTED.
2923009caf47 [xemacs-hg @ 2002-03-16 10:38:59 by ben]
ben
parents:
diff changeset
41 Char table of characters which is not composed relatively.
2923009caf47 [xemacs-hg @ 2002-03-16 10:38:59 by ben]
ben
parents:
diff changeset
42 If an entry for a character is non-nil, a composition sequence
2923009caf47 [xemacs-hg @ 2002-03-16 10:38:59 by ben]
ben
parents:
diff changeset
43 which contains that character is displayed so that
2923009caf47 [xemacs-hg @ 2002-03-16 10:38:59 by ben]
ben
parents:
diff changeset
44 the glyph of that character is put without considering
2923009caf47 [xemacs-hg @ 2002-03-16 10:38:59 by ben]
ben
parents:
diff changeset
45 an ascent and descent value of a previous character.")
2923009caf47 [xemacs-hg @ 2002-03-16 10:38:59 by ben]
ben
parents:
diff changeset
46
2923009caf47 [xemacs-hg @ 2002-03-16 10:38:59 by ben]
ben
parents:
diff changeset
47 (defvar compose-chars-after-function 'compose-chars-after
2923009caf47 [xemacs-hg @ 2002-03-16 10:38:59 by ben]
ben
parents:
diff changeset
48 "UNIMPLEMENTED.
2923009caf47 [xemacs-hg @ 2002-03-16 10:38:59 by ben]
ben
parents:
diff changeset
49 Function to adjust composition of buffer text.
2923009caf47 [xemacs-hg @ 2002-03-16 10:38:59 by ben]
ben
parents:
diff changeset
50
2923009caf47 [xemacs-hg @ 2002-03-16 10:38:59 by ben]
ben
parents:
diff changeset
51 The function is called with three arguments FROM, TO, and OBJECT.
2923009caf47 [xemacs-hg @ 2002-03-16 10:38:59 by ben]
ben
parents:
diff changeset
52 FROM and TO specify the range of text of which composition should be
2923009caf47 [xemacs-hg @ 2002-03-16 10:38:59 by ben]
ben
parents:
diff changeset
53 adjusted. OBJECT, if non-nil, is a string that contains the text.
2923009caf47 [xemacs-hg @ 2002-03-16 10:38:59 by ben]
ben
parents:
diff changeset
54
2923009caf47 [xemacs-hg @ 2002-03-16 10:38:59 by ben]
ben
parents:
diff changeset
55 This function is called after a text with `composition' property is
2923009caf47 [xemacs-hg @ 2002-03-16 10:38:59 by ben]
ben
parents:
diff changeset
56 inserted or deleted to keep `composition' property of buffer text
2923009caf47 [xemacs-hg @ 2002-03-16 10:38:59 by ben]
ben
parents:
diff changeset
57 valid.
2923009caf47 [xemacs-hg @ 2002-03-16 10:38:59 by ben]
ben
parents:
diff changeset
58
2923009caf47 [xemacs-hg @ 2002-03-16 10:38:59 by ben]
ben
parents:
diff changeset
59 The default value is the function `compose-chars-after'.")
2923009caf47 [xemacs-hg @ 2002-03-16 10:38:59 by ben]
ben
parents:
diff changeset
60
2923009caf47 [xemacs-hg @ 2002-03-16 10:38:59 by ben]
ben
parents:
diff changeset
61 (defvar composition-function-table (make-char-table 'generic)
2923009caf47 [xemacs-hg @ 2002-03-16 10:38:59 by ben]
ben
parents:
diff changeset
62 "UNIMPLEMENTED.
2923009caf47 [xemacs-hg @ 2002-03-16 10:38:59 by ben]
ben
parents:
diff changeset
63 Char table of patterns and functions to make a composition.
2923009caf47 [xemacs-hg @ 2002-03-16 10:38:59 by ben]
ben
parents:
diff changeset
64
2923009caf47 [xemacs-hg @ 2002-03-16 10:38:59 by ben]
ben
parents:
diff changeset
65 Each element is nil or an alist of PATTERNs vs FUNCs, where PATTERNs
2923009caf47 [xemacs-hg @ 2002-03-16 10:38:59 by ben]
ben
parents:
diff changeset
66 are regular expressions and FUNCs are functions. FUNC is responsible
2923009caf47 [xemacs-hg @ 2002-03-16 10:38:59 by ben]
ben
parents:
diff changeset
67 for composing text matching the corresponding PATTERN. FUNC is called
2923009caf47 [xemacs-hg @ 2002-03-16 10:38:59 by ben]
ben
parents:
diff changeset
68 with three arguments FROM, TO, and PATTERN. See the function
2923009caf47 [xemacs-hg @ 2002-03-16 10:38:59 by ben]
ben
parents:
diff changeset
69 `compose-chars-after' for more detail.
2923009caf47 [xemacs-hg @ 2002-03-16 10:38:59 by ben]
ben
parents:
diff changeset
70
2923009caf47 [xemacs-hg @ 2002-03-16 10:38:59 by ben]
ben
parents:
diff changeset
71 This table is looked up by the first character of a composition when
2923009caf47 [xemacs-hg @ 2002-03-16 10:38:59 by ben]
ben
parents:
diff changeset
72 the composition gets invalid after a change in a buffer.")
2923009caf47 [xemacs-hg @ 2002-03-16 10:38:59 by ben]
ben
parents:
diff changeset
73
2923009caf47 [xemacs-hg @ 2002-03-16 10:38:59 by ben]
ben
parents:
diff changeset
74 (defun compose-region-internal (start end &optional components mod-func)
2923009caf47 [xemacs-hg @ 2002-03-16 10:38:59 by ben]
ben
parents:
diff changeset
75 "UNIMPLEMENTED.
2923009caf47 [xemacs-hg @ 2002-03-16 10:38:59 by ben]
ben
parents:
diff changeset
76 Internal use only.
2923009caf47 [xemacs-hg @ 2002-03-16 10:38:59 by ben]
ben
parents:
diff changeset
77
2923009caf47 [xemacs-hg @ 2002-03-16 10:38:59 by ben]
ben
parents:
diff changeset
78 Compose text in the region between START and END.
2923009caf47 [xemacs-hg @ 2002-03-16 10:38:59 by ben]
ben
parents:
diff changeset
79 Optional 3rd and 4th arguments are COMPONENTS and MODIFICATION-FUNC
2923009caf47 [xemacs-hg @ 2002-03-16 10:38:59 by ben]
ben
parents:
diff changeset
80 for the composition. See `compose-region' for more detial."
2923009caf47 [xemacs-hg @ 2002-03-16 10:38:59 by ben]
ben
parents:
diff changeset
81 nil)
2923009caf47 [xemacs-hg @ 2002-03-16 10:38:59 by ben]
ben
parents:
diff changeset
82
2923009caf47 [xemacs-hg @ 2002-03-16 10:38:59 by ben]
ben
parents:
diff changeset
83 (defun compose-string-internal (string start end &optional components mod-func)
2923009caf47 [xemacs-hg @ 2002-03-16 10:38:59 by ben]
ben
parents:
diff changeset
84 "UNIMPLEMENTED.
2923009caf47 [xemacs-hg @ 2002-03-16 10:38:59 by ben]
ben
parents:
diff changeset
85 Internal use only.
2923009caf47 [xemacs-hg @ 2002-03-16 10:38:59 by ben]
ben
parents:
diff changeset
86
2923009caf47 [xemacs-hg @ 2002-03-16 10:38:59 by ben]
ben
parents:
diff changeset
87 Compose text between indices START and END of STRING.
2923009caf47 [xemacs-hg @ 2002-03-16 10:38:59 by ben]
ben
parents:
diff changeset
88 Optional 4th and 5th arguments are COMPONENTS and MODIFICATION-FUNC
2923009caf47 [xemacs-hg @ 2002-03-16 10:38:59 by ben]
ben
parents:
diff changeset
89 for the composition. See `compose-string' for more detial."
2923009caf47 [xemacs-hg @ 2002-03-16 10:38:59 by ben]
ben
parents:
diff changeset
90 nil)
2923009caf47 [xemacs-hg @ 2002-03-16 10:38:59 by ben]
ben
parents:
diff changeset
91
2923009caf47 [xemacs-hg @ 2002-03-16 10:38:59 by ben]
ben
parents:
diff changeset
92 (defun find-composition-internal (pos limit string detail-p)
2923009caf47 [xemacs-hg @ 2002-03-16 10:38:59 by ben]
ben
parents:
diff changeset
93 "UNIMPLEMENTED.
2923009caf47 [xemacs-hg @ 2002-03-16 10:38:59 by ben]
ben
parents:
diff changeset
94 Internal use only.
2923009caf47 [xemacs-hg @ 2002-03-16 10:38:59 by ben]
ben
parents:
diff changeset
95
2923009caf47 [xemacs-hg @ 2002-03-16 10:38:59 by ben]
ben
parents:
diff changeset
96 Return information about composition at or nearest to position POS.
2923009caf47 [xemacs-hg @ 2002-03-16 10:38:59 by ben]
ben
parents:
diff changeset
97 See `find-composition' for more detail."
2923009caf47 [xemacs-hg @ 2002-03-16 10:38:59 by ben]
ben
parents:
diff changeset
98 nil)