Mercurial > hg > xemacs-beta
annotate lisp/mule/mule-composite-stub.el @ 4690:257b468bf2ca
Move the #'query-coding-region implementation to C.
This is necessary because there is no reasonable way to access the
corresponding mswindows-multibyte functionality from Lisp, and we need such
functionality if we're going to have a reliable and portable
#'query-coding-region implementation. However, this change doesn't yet
provide #'query-coding-region for the mswindow-multibyte coding systems,
there should be no functional differences between an XEmacs with this change
and one without it.
src/ChangeLog addition:
2009-09-19 Aidan Kehoe <kehoea@parhasard.net>
Move the #'query-coding-region implementation to C.
This is necessary because there is no reasonable way to access the
corresponding mswindows-multibyte functionality from Lisp, and we
need such functionality if we're going to have a reliable and
portable #'query-coding-region implementation. However, this
change doesn't yet provide #'query-coding-region for the
mswindow-multibyte coding systems, there should be no functional
differences between an XEmacs with this change and one without it.
* mule-coding.c (struct fixed_width_coding_system):
Add a new coding system type, fixed_width, and implement it. It
uses the CCL infrastructure but has a much simpler creation API,
and its own query_method, formerly in lisp/mule/mule-coding.el.
* unicode.c:
Move the Unicode query method implementation here from
unicode.el.
* lisp.h: Declare Fmake_coding_system_internal, Fcopy_range_table
here.
* intl-win32.c (complex_vars_of_intl_win32):
Use Fmake_coding_system_internal, not Fmake_coding_system.
* general-slots.h: Add Qsucceeded, Qunencodable, Qinvalid_sequence
here.
* file-coding.h (enum coding_system_variant):
Add fixed_width_coding_system here.
(struct coding_system_methods):
Add query_method and query_lstream_method to the coding system
methods.
Provide flags for the query methods.
Declare the default query method; initialise it correctly in
INITIALIZE_CODING_SYSTEM_TYPE.
* file-coding.c (default_query_method):
New function, the default query method for coding systems that do
not set it. Moved from coding.el.
(make_coding_system_1):
Accept new elements in PROPS in #'make-coding-system; aliases, a
list of aliases; safe-chars and safe-charsets (these were
previously accepted but not saved); and category.
(Fmake_coding_system_internal):
New function, what used to be #'make-coding-system--on Mule
builds, we've now moved some of the functionality of this to
Lisp.
(Fcoding_system_canonical_name_p):
Move this earlier in the file, since it's now called from within
make_coding_system_1.
(Fquery_coding_region):
Move the implementation of this here, from coding.el.
(complex_vars_of_file_coding):
Call Fmake_coding_system_internal, not Fmake_coding_system;
specify safe-charsets properties when we're a mule build.
* extents.h (mouse_highlight_priority, Fset_extent_priority,
Fset_extent_face, Fmap_extents):
Make these available to other C files.
lisp/ChangeLog addition:
2009-09-19 Aidan Kehoe <kehoea@parhasard.net>
Move the #'query-coding-region implementation to C.
* coding.el:
Consolidate code that depends on the presence or absence of Mule
at the end of this file.
(default-query-coding-region, query-coding-region):
Move these functions to C.
(default-query-coding-region-safe-charset-skip-chars-map):
Remove this variable, the corresponding C variable is
Vdefault_query_coding_region_chartab_cache in file-coding.c.
(query-coding-string): Update docstring to reflect actual multiple
values, be more careful about not modifying a range table that
we're currently mapping over.
(encode-coding-char): Make the implementation of this simpler.
(featurep 'mule): Autoload #'make-coding-system from
mule/make-coding-system.el if we're a mule build; provide an
appropriate compiler macro.
Do various non-mule compatibility things if we're not a mule
build.
* update-elc.el (additional-dump-dependencies):
Add mule/make-coding-system as a dump time dependency if we're a
mule build.
* unicode.el (ccl-encode-to-ucs-2):
(decode-char):
(encode-char):
Move these earlier in the file, for the sake of some byte compile
warnings.
(unicode-query-coding-region):
Move this to unicode.c
* mule/make-coding-system.el:
New file, not dumped. Contains the functionality to rework the
arguments necessary for fixed-width coding systems, and contains
the implementation of #'make-coding-system, which now calls
#'make-coding-system-internal.
* mule/vietnamese.el (viscii):
* mule/latin.el (iso-8859-2):
(windows-1250):
(iso-8859-3):
(iso-8859-4):
(iso-8859-14):
(iso-8859-15):
(iso-8859-16):
(iso-8859-9):
(macintosh):
(windows-1252):
* mule/hebrew.el (iso-8859-8):
* mule/greek.el (iso-8859-7):
(windows-1253):
* mule/cyrillic.el (iso-8859-5):
(koi8-r):
(koi8-u):
(windows-1251):
(alternativnyj):
(koi8-ru):
(koi8-t):
(koi8-c):
(koi8-o):
* mule/arabic.el (iso-8859-6):
(windows-1256):
Move all these coding systems to being of type fixed-width, not of
type CCL. This allows the distinct query-coding-region for them to
be in C, something which will eventually allow us to implement
query-coding-region for the mswindows-multibyte coding systems.
* mule/general-late.el (posix-charset-to-coding-system-hash):
Document why we're pre-emptively persuading the byte compiler that
the ELC for this file needs to be written using escape-quoted.
Call #'set-unicode-query-skip-chars-args, now the Unicode
query-coding-region implementation is in C.
* mule/thai-xtis.el (tis-620):
Don't bother checking whether we're XEmacs or not here.
* mule/mule-coding.el:
Move the eight bit fixed-width functionality from this file to
make-coding-system.el.
tests/ChangeLog addition:
2009-09-19 Aidan Kehoe <kehoea@parhasard.net>
* automated/mule-tests.el:
Check a coding system's type, not an 8-bit-fixed property, for
whether that coding system should be treated as a fixed-width
coding system.
* automated/query-coding-tests.el:
Don't test the query coding functionality for mswindows-multibyte
coding systems, it's not yet implemented.
| author | Aidan Kehoe <kehoea@parhasard.net> |
|---|---|
| date | Sat, 19 Sep 2009 22:53:13 +0100 |
| parents | 2923009caf47 |
| children | 308d34e9f07d |
| rev | line source |
|---|---|
| 778 | 1 ;;; mule-composite-stub.el --- Stubs of composition support -*- coding: iso-2022-7bit; -*- |
| 2 | |
| 3 ;; Copyright (C) 2002 Ben Wing. | |
| 4 | |
| 5 ;; Keywords: multibyte character, composition | |
| 6 | |
| 7 ;; This file is part of XEmacs. | |
| 8 | |
| 9 ;; XEmacs is free software; you can redistribute it and/or modify it | |
| 10 ;; under the terms of the GNU General Public License as published by | |
| 11 ;; the Free Software Foundation; either version 2, or (at your option) | |
| 12 ;; any later version. | |
| 13 | |
| 14 ;; XEmacs is distributed in the hope that it will be useful, but | |
| 15 ;; WITHOUT ANY WARRANTY; without even the implied warranty of | |
| 16 ;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU | |
| 17 ;; General Public License for more details. | |
| 18 | |
| 19 ;; You should have received a copy of the GNU General Public License | |
| 20 ;; along with XEmacs; see the file COPYING. If not, write to the Free | |
| 21 ;; Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA | |
| 22 ;; 02111-1307, USA. | |
| 23 | |
| 24 ;;; Synched up with: Emacs 21.1 (src/fontset.c, src/composite.c). | |
| 25 | |
| 26 ;;; Commentary: | |
| 27 | |
| 28 ;;; Code: | |
| 29 | |
| 30 (defvar use-default-ascent (make-char-table 'generic) | |
| 31 "UNIMPLEMENTED. | |
| 32 Char table of characters whose ascent values should be ignored. | |
| 33 If an entry for a character is non-nil, the ascent value of the glyph | |
| 34 is assumed to be what specified by _MULE_DEFAULT_ASCENT property of a font. | |
| 35 | |
| 36 This affects how a composite character which contains | |
| 37 such a character is displayed on screen.") | |
| 38 | |
| 39 (defvar ignore-relative-composition (make-char-table 'generic) | |
| 40 "UNIMPLEMENTED. | |
| 41 Char table of characters which is not composed relatively. | |
| 42 If an entry for a character is non-nil, a composition sequence | |
| 43 which contains that character is displayed so that | |
| 44 the glyph of that character is put without considering | |
| 45 an ascent and descent value of a previous character.") | |
| 46 | |
| 47 (defvar compose-chars-after-function 'compose-chars-after | |
| 48 "UNIMPLEMENTED. | |
| 49 Function to adjust composition of buffer text. | |
| 50 | |
| 51 The function is called with three arguments FROM, TO, and OBJECT. | |
| 52 FROM and TO specify the range of text of which composition should be | |
| 53 adjusted. OBJECT, if non-nil, is a string that contains the text. | |
| 54 | |
| 55 This function is called after a text with `composition' property is | |
| 56 inserted or deleted to keep `composition' property of buffer text | |
| 57 valid. | |
| 58 | |
| 59 The default value is the function `compose-chars-after'.") | |
| 60 | |
| 61 (defvar composition-function-table (make-char-table 'generic) | |
| 62 "UNIMPLEMENTED. | |
| 63 Char table of patterns and functions to make a composition. | |
| 64 | |
| 65 Each element is nil or an alist of PATTERNs vs FUNCs, where PATTERNs | |
| 66 are regular expressions and FUNCs are functions. FUNC is responsible | |
| 67 for composing text matching the corresponding PATTERN. FUNC is called | |
| 68 with three arguments FROM, TO, and PATTERN. See the function | |
| 69 `compose-chars-after' for more detail. | |
| 70 | |
| 71 This table is looked up by the first character of a composition when | |
| 72 the composition gets invalid after a change in a buffer.") | |
| 73 | |
| 74 (defun compose-region-internal (start end &optional components mod-func) | |
| 75 "UNIMPLEMENTED. | |
| 76 Internal use only. | |
| 77 | |
| 78 Compose text in the region between START and END. | |
| 79 Optional 3rd and 4th arguments are COMPONENTS and MODIFICATION-FUNC | |
| 80 for the composition. See `compose-region' for more detial." | |
| 81 nil) | |
| 82 | |
| 83 (defun compose-string-internal (string start end &optional components mod-func) | |
| 84 "UNIMPLEMENTED. | |
| 85 Internal use only. | |
| 86 | |
| 87 Compose text between indices START and END of STRING. | |
| 88 Optional 4th and 5th arguments are COMPONENTS and MODIFICATION-FUNC | |
| 89 for the composition. See `compose-string' for more detial." | |
| 90 nil) | |
| 91 | |
| 92 (defun find-composition-internal (pos limit string detail-p) | |
| 93 "UNIMPLEMENTED. | |
| 94 Internal use only. | |
| 95 | |
| 96 Return information about composition at or nearest to position POS. | |
| 97 See `find-composition' for more detail." | |
| 98 nil) |