Mercurial > hg > xemacs-beta
view lisp/mule/mule-coding.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 | c786c3fd0740 |
children | 308d34e9f07d |
line wrap: on
line source
;;; mule-coding.el --- Coding-system functions for Mule. -*- coding: iso-2022-7bit; -*- ;; Copyright (C) 1995 Electrotechnical Laboratory, JAPAN. ;; Licensed to the Free Software Foundation. ;; Copyright (C) 1995 Amdahl Corporation. ;; Copyright (C) 1995 Sun Microsystems. ;; Copyright (C) 1997 MORIOKA Tomohiko ;; Copyright (C) 2001 Ben Wing. ;; This file is part of XEmacs. ;; XEmacs is free software; you can redistribute it and/or modify it ;; under the terms of the GNU General Public License as published by ;; the Free Software Foundation; either version 2, or (at your option) ;; any later version. ;; XEmacs is distributed in the hope that it will be useful, but ;; WITHOUT ANY WARRANTY; without even the implied warranty of ;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU ;; General Public License for more details. ;; You should have received a copy of the GNU General Public License ;; along with XEmacs; see the file COPYING. If not, write to the ;; Free Software Foundation, Inc., 59 Temple Place - Suite 330, ;; Boston, MA 02111-1307, USA. ;;; Commentary: ;;; split off of mule.el and mostly moved to coding.el ;;; Code: (defun coding-system-force-on-output (coding-system register) "Return the 'force-on-output property of CODING-SYSTEM for the specified REGISTER." (check-type register integer) (coding-system-property coding-system (case register (0 'force-g0-on-output) (1 'force-g1-on-output) (2 'force-g2-on-output) (3 'force-g3-on-output) (t (signal 'args-out-of-range (list register 0 3)))))) (defun coding-system-short (coding-system) "Return the 'short property of CODING-SYSTEM." (coding-system-property coding-system 'short)) (defun coding-system-no-ascii-eol (coding-system) "Return the 'no-ascii-eol property of CODING-SYSTEM." (coding-system-property coding-system 'no-ascii-eol)) (defun coding-system-no-ascii-cntl (coding-system) "Return the 'no-ascii-cntl property of CODING-SYSTEM." (coding-system-property coding-system 'no-ascii-cntl)) (defun coding-system-seven (coding-system) "Return the 'seven property of CODING-SYSTEM." (coding-system-property coding-system 'seven)) (defun coding-system-lock-shift (coding-system) "Return the 'lock-shift property of CODING-SYSTEM." (coding-system-property coding-system 'lock-shift)) ;;(defun coding-system-use-japanese-jisx0201-roman (coding-system) ;; "Return the 'use-japanese-jisx0201-roman property of CODING-SYSTEM." ;; (coding-system-property coding-system 'use-japanese-jisx0201-roman)) ;;(defun coding-system-use-japanese-jisx0208-1978 (coding-system) ;; "Return the 'use-japanese-jisx0208-1978 property of CODING-SYSTEM." ;; (coding-system-property coding-system 'use-japanese-jisx0208-2978)) (defun coding-system-no-iso6429 (coding-system) "Return the 'no-iso6429 property of CODING-SYSTEM." (coding-system-property coding-system 'no-iso6429)) (defun coding-system-ccl-encode (coding-system) "Return the CCL 'encode property of CODING-SYSTEM." (coding-system-property coding-system 'encode)) (defun coding-system-ccl-decode (coding-system) "Return the CCL 'decode property of CODING-SYSTEM." (coding-system-property coding-system 'decode)) (defun coding-system-iso2022-charset (coding-system register) "Return the charset initially designated to REGISTER in CODING-SYSTEM. The allowable range of REGISTER is 0 through 3." (if (or (< register 0) (> register 3)) (error 'args-out-of-range "coding-system-charset REGISTER" register 0 3)) (coding-system-property coding-system (nth register '(charset-g0 charset-g1 charset-g2 charset-g3)))) ;;;; Definitions of predefined coding systems (make-coding-system 'ctext 'iso2022 "Compound Text" '(charset-g0 ascii charset-g1 latin-iso8859-1 eol-type nil safe-charsets t ;; Reasonable mnemonic "CText")) (make-coding-system 'iso-2022-8bit-ss2 'iso2022 "ISO-2022 8-bit w/SS2" '(charset-g0 ascii charset-g1 latin-iso8859-1 charset-g2 t ;; unspecified but can be used later. short t safe-charsets (ascii katakana-jisx0201 japanese-jisx0208-1978 japanese-jisx0208 japanese-jisx0212 japanese-jisx0213-1 japanese-jisx0213-2) mnemonic "ISO8/SS" documentation "ISO 2022 based 8-bit encoding using SS2 for 96-charset" )) (make-coding-system 'iso-2022-7bit-ss2 'iso2022 "ISO-2022 7-bit w/SS2" '(charset-g0 ascii charset-g2 t ;; unspecified but can be used later. seven t short t safe-charsets t mnemonic "ISO7/SS" documentation "ISO 2022 based 7-bit encoding using SS2 for 96-charset" eol-type nil)) ;; (copy-coding-system 'iso-2022-7bit-ss2 'iso-2022-jp-2) (make-coding-system 'iso-2022-jp-2 'iso2022 "ISO-2022-JP-2" '(charset-g0 ascii charset-g2 t ;; unspecified but can be used later. seven t short t safe-charsets t mnemonic "ISO7/SS" eol-type nil)) (make-coding-system 'iso-2022-7bit 'iso2022 "ISO 2022 7-bit" '(charset-g0 ascii seven t short t safe-charsets t mnemonic "ISO7" documentation "ISO-2022-based 7-bit encoding using only G0" )) ;; compatibility for old XEmacsen (define-coding-system-alias 'iso-2022-7 'iso-2022-7bit) (make-coding-system 'iso-2022-8 'iso2022 "ISO-2022 8-bit" '(charset-g0 ascii charset-g1 latin-iso8859-1 short t safe-charsets t mnemonic "ISO8" documentation "ISO-2022 eight-bit coding system. No single-shift or locking-shift." )) (make-coding-system 'escape-quoted 'iso2022 "Escape-Quoted (for .ELC files)" '(charset-g0 ascii charset-g1 latin-iso8859-1 eol-type lf escape-quoted t safe-charsets t mnemonic "ESC/Quot" documentation "ISO-2022 eight-bit coding system with escape quoting; used for .ELC files." )) (make-coding-system 'iso-2022-lock 'iso2022 "ISO-2022 w/locking-shift" '(charset-g0 ascii charset-g1 t ;; unspecified but can be used later. seven t lock-shift t safe-charsets t mnemonic "ISO7/Lock" documentation "ISO-2022 coding system using Locking-Shift for 96-charset." )) ;; This is used by people writing CCL programs, but is called at runtime. (defun define-translation-hash-table (symbol table) "Define SYMBOL as the name of the hash translation TABLE for use in CCL. Analogous to `define-translation-table', but updates `translation-hash-table-vector' and the table is for use in the CCL `lookup-integer' and `lookup-character' functions." (check-argument-type #'symbolp symbol) (check-argument-type #'hash-table-p table) (let ((len (length translation-hash-table-vector)) (id 0) done) (put symbol 'translation-hash-table table) (while (not done) (if (>= id len) (setq translation-hash-table-vector (vconcat translation-hash-table-vector [nil]))) (let ((slot (aref translation-hash-table-vector id))) (if (or (not slot) (eq (car slot) symbol)) (progn (aset translation-hash-table-vector id (cons symbol table)) (setq done t)) (setq id (1+ id))))) (put symbol 'translation-hash-table-id id) id)) ;; Ideally this would be in latin.el, but code-init.el uses it. (make-coding-system 'iso-8859-1 'fixed-width "ISO-8859-1 (Latin-1)" (eval-when-compile `(unicode-map ,(loop for i from #x80 to #xff collect (list i (int-char i))) ;; Identical to Latin-1. mnemonic "Latin 1" documentation "The most used encoding of Western Europe and the Americas." aliases (iso-latin-1 latin-1))))