Mercurial > hg > xemacs-beta
annotate lisp/mule/mule-msw-init-late.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 | d402d7b18bd8 |
| children | 980575c76541 |
| rev | line source |
|---|---|
| 780 | 1 ;;; mule-msw-init-late.el --- initialization code for MS Windows under MULE |
| 2 ;;; Copyright (C) 2001, 2002 Ben Wing. | |
| 3 | |
| 4 ;; This file is part of XEmacs. | |
| 5 | |
| 6 ;; XEmacs is free software; you can redistribute it and/or modify it | |
| 7 ;; under the terms of the GNU General Public License as published by | |
| 8 ;; the Free Software Foundation; either version 2, or (at your option) | |
| 9 ;; any later version. | |
| 10 | |
| 11 ;; XEmacs is distributed in the hope that it will be useful, but | |
| 12 ;; WITHOUT ANY WARRANTY; without even the implied warranty of | |
| 13 ;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU | |
| 14 ;; General Public License for more details. | |
| 15 | |
| 16 ;; You should have received a copy of the GNU General Public License | |
| 17 ;; along with XEmacs; see the file COPYING. If not, write to the | |
| 18 ;; Free Software Foundation, Inc., 59 Temple Place - Suite 330, | |
| 19 ;; Boston, MA 02111-1307, USA. | |
| 20 | |
| 21 ;; mapping between XEmacs charsets and code pages. something like this | |
| 22 ;; will might around once all the Unicode code is written, so we know how | |
| 23 ;; to choose the right font. (perhaps "code pages" will become "Unicode | |
| 24 ;; subranges"; they're more or less equivalent under Windows from a font | |
| 25 ;; perspective.) But ... in reality, we can just query the charset for its | |
| 26 ;; Unicode ranges, and the "charset ID" is not a good indicator of what a | |
| 27 ;; particular font supports; e.g. there's no charset ID at all for Indian | |
| 28 ;; fonts, but Windows clearly supports them. (The docs say that Indian | |
| 29 ;; support is "all Unicode"; i.e. charset ID's are on their way out. I | |
| 30 ;; guess we're supposed to query the font for what ranges it supports, and | |
| 31 ;; what its preferred range is.) | |
| 32 | |
| 872 | 33 (let ((l '((ascii . "Western") |
| 34 (latin-iso8859-2 . "Central European") | |
| 35 (cyrillic-iso8859-5 . "Cyrillic") | |
| 36 (latin-iso8859-1 . "Western") | |
| 37 (greek-iso8859-7 . "Greek") | |
| 38 (latin-iso8859-9 . "Turkish") | |
| 39 (hebrew-iso8859-8 . "Hebrew") | |
| 40 (latin-iso8859-4 . "Baltic") | |
| 41 (vietnamese-viscii-lower . "Viet Nam") | |
| 42 (vietnamese-viscii-upper . "Viet Nam") | |
| 43 (thai-tis620 . "Thai") | |
| 44 (latin-jisx0201 . "Japanese") | |
| 45 (katakana-jisx0201 . "Japanese") | |
| 46 ;; (japanese-jisx0208-1978 . "Japanese") | |
| 47 (japanese-jisx0208 . "Japanese") | |
| 48 (japanese-jisx0212 . "Japanese") | |
| 49 (chinese-gb2312 . "Simplified Chinese") | |
| 50 (korean-ksc5601 . "Korean") | |
| 51 (chinese-big5-1 . "Traditional Chinese") | |
| 52 (chinese-big5-2 . "Traditional Chinese")))) | |
| 53 (while l | |
| 54 (let ((charset (car (car l))) | |
| 55 (registry (cdr (car l)))) | |
| 4103 | 56 (declare-fboundp (mswindows-set-charset-registry charset registry)) |
| 872 | 57 (setq l (cdr l))))) |
| 58 | |
| 780 | 59 (let ((l '((ascii . 1252) |
| 60 (latin-iso8859-2 . 1250) | |
| 61 (cyrillic-iso8859-5 . 1251) | |
| 62 (latin-iso8859-1 . 1252) | |
| 63 (greek-iso8859-7 . 1253) | |
| 64 (latin-iso8859-9 . 1254) | |
| 65 (hebrew-iso8859-8 . 1255) | |
| 66 ;; (arabic-iso8859-6 . 1256) | |
| 67 (latin-iso8859-4 . 1257) | |
| 68 (vietnamese-viscii-lower . 1258) | |
| 69 (vietnamese-viscii-upper . 1258) | |
| 70 ;; (thai-tis620 . 874) | |
| 71 (latin-jisx0201 . 932) | |
| 72 (katakana-jisx0201 . 932) | |
| 73 ;; (japanese-jisx0208-1978 . 932) | |
| 74 (japanese-jisx0208 . 932) | |
| 75 (japanese-jisx0212 . 932) | |
| 76 (chinese-gb2312 . 936) | |
| 77 (korean-ksc5601 . 949) | |
| 78 (chinese-big5-1 . 950) | |
| 79 (chinese-big5-2 . 950)))) | |
| 80 (while l | |
| 81 (let ((charset (car (car l))) | |
| 82 (code-page (cdr (car l)))) | |
| 4103 | 83 (declare-fboundp (mswindows-set-charset-code-page charset code-page)) |
| 780 | 84 (setq l (cdr l))))) |