Mercurial > hg > xemacs-beta
view lisp/mule/thai-util.el @ 4477:e34711681f30
Don't determine whether to call general device-type code at startup,
rather decide in the device-specific code itself.
lisp/ChangeLog addition:
2008-07-07 Aidan Kehoe <kehoea@parhasard.net>
Patch to make it up to the device-specific code whether
various Lisp functions should be called during device creation,
not relying on the startup code to decide this. Also, rename
initial-window-system to initial-device-type (which makes more
sense in this scheme), always set it.
* startup.el (command-line):
Use initial-device-type, not initial-window-system; just call
#'make-device, leave the special behaviour to be done the first
time a console type is initialised to be decided on by the
respective console code.
* x-init.el (x-app-defaults-directory): Declare that it should be
bound.
(x-define-dead-key): Have the macro take a DEVICE argument.
(x-initialize-compose): Have the function take a DEVICE argument,
and use it when checking if various keysyms are available on the
keyboard.
(x-initialize-keyboard): Have the function take a DEVICE argument,
allowing device-specific keyboard initialisation.
(make-device-early-x-entry-point-called-p): New.
(make-device-late-x-entry-point-called-p): New. Rename
pre-x-win-initted, x-win-initted.
(make-device-early-x-entry-point): Rename init-pre-x-win, take the
call to make-x-device out (it should be called from the
device-creation code, not vice-versa).
(make-device-late-x-entry-point): Rename init-post-x-win, have it
take a DEVICE argument, use that DEVICE argument when working out
what device-specific things need doing. Don't use
create-console-hook in core code.
* x-win-xfree86.el (x-win-init-xfree86): Take a DEVICE argument;
use it.
* x-win-sun.el (x-win-init-sun): Take a DEVICE argument; use it.
* mule/mule-x-init.el: Remove #'init-mule-x-win, an empty
function.
* tty-init.el (make-device-early-tty-entry-point-called-p): New.
Rename pre-tty-win-initted.
(make-device-early-tty-entry-point): New.
Rename init-pre-tty-win.
(make-frame-after-init-entry-point): New.
Rename init-post-tty-win to better reflect when it's called.
* gtk-init.el (gtk-early-lisp-options-file): New.
Move this path to a documented variable.
(gtk-command-switch-alist): Wrap the docstring to fewer than 79
columns.
(make-device-early-gtk-entry-point-called-p): New.
(make-device-late-gtk-entry-point-called-p): New.
Renamed gtk-pre-win-initted, gtk-post-win-initted to these.
(make-device-early-gtk-entry-point): New.
(make-device-late-gtk-entry-point): New.
Renamed init-pre-gtk-win, init-post-gtk-win to these.
Have make-device-late-gtk-entry-point take a device argument, and use
it; have make-device-early-gtk-entry-point load the GTK-specific
startup code, instead of doing that in C.
(init-gtk-win): Deleted, functionality moved to the GTK device
creation code.
(gtk-define-dead-key): Have it take a DEVICE argument; use this
argument.
(gtk-initialize-compose): Ditto.
* coding.el (set-terminal-coding-system):
Correct the docstring; the function isn't broken.
src/ChangeLog addition:
2008-07-07 Aidan Kehoe <kehoea@parhasard.net>
Patch to make it up to the device-specific code whether
various Lisp functions should be called during device creation,
not relying on the startup code to decide this. Also, rename
initial-window-system to initial-device-type (which makes more
sense in this scheme), always set it.
* redisplay.c (Vinitial_device_type): New.
(Vinitial_window_system): Removed.
Rename initial-window-system to initial-device type, making it
a stream if we're noninteractive. Update its docstring.
* device-x.c (Qmake_device_early_x_entry_point,
Qmake_device_late_x_entry_point): New.
Rename Qinit_pre_x_win, Qinit_post_x_win.
(x_init_device): Call #'make-device-early-x-entry-point earlier,
now we rely on it to find the application class and the
app-defaults directory.
(x_finish_init_device): Call #'make-device-late-x-entry-point with
the created device.
(Vx_app_defaults_directory): Always make this available, to
simplify code in x-init.el.
* device-tty.c (Qmake_device_early_tty_entry_point): New.
Rename Qinit_pre_tty_win, rename Qinit_post_tty_win and move to
frame-tty.c as Qmake_frame_after_init_entry_point.
(tty_init_device): Call #'make-device-early-tty-entry-point before
doing anything.
* frame-tty.c (Qmake_frame_after_init_entry_point): New.
* frame-tty.c (tty_after_init_frame): Have it call the
better-named #'make-frame-after-init-entry-point function
instead of #'init-post-tty-win (since it's called after frame, not
device, creation).
* device-msw.c (Qmake_device_early_mswindows_entry_point,
Qmake_device_late_mswindows_entry_point): New.
Rename Qinit_pre_mswindows_win, Qinit_post_mswindows_win.
(mswindows_init_device): Call
#'make-device-early-mswindows-entry-point here, instead of having
its predecessor call us.
(mswindows_finish_init_device): Call
#'make-device-early-mswindows-entry-point, for symmetry with the
other device types (though it's an empty function).
* device-gtk.c (Qmake_device_early_gtk_entry_point,
Qmake_device_late_gtk_entry_point): New.
Rename Qinit_pre_gtk_win, Qinit_post_gtk_win.
(gtk_init_device): Call #'make-device-early-gtk-entry-point; don't
load ~/.xemacs/gtk-options.el ourselves, leave that to lisp.
(gtk_finish_init_device): Call #'make-device-late-gtk-entry-point
with the created device as an argument.
author | Aidan Kehoe <kehoea@parhasard.net> |
---|---|
date | Wed, 09 Jul 2008 20:46:22 +0200 |
parents | 2923009caf47 |
children | 3889ef128488 308d34e9f07d |
line wrap: on
line source
;;; thai-util.el --- utilities for Thai -*- coding: iso-2022-7bit; -*- ;; Copyright (C) 1995 Electrotechnical Laboratory, JAPAN. ;; Licensed to the Free Software Foundation. ;; Keywords: mule, multilingual, thai ;; 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. ;;; Synched up with: Emacs 21.1 (language/thai-util.el). ;;; Commentary: ;;; Code: ;; Setting information of Thai characters. (defconst thai-category-table (make-category-table)) (define-category ?c "Thai consonant" thai-category-table) (define-category ?v "Thai upper/lower vowel" thai-category-table) (define-category ?t "Thai tone" thai-category-table) ;; The general composing rules are as follows: ;; ;; T ;; V T V T ;; CV -> C, CT -> C, CVT -> C, Cv -> C, CvT -> C ;; v v ;; ;; where C: consonant, V: vowel upper, v: vowel lower, T: tone mark. (defvar thai-composition-pattern "\\cc\\(\\ct\\|\\cv\\ct?\\)" "Regular expression matching a Thai composite sequence.") (let ((l '((?,T!(B consonant "LETTER KO KAI") ; 0xA1 (?,T"(B consonant "LETTER KHO KHAI") ; 0xA2 (?,T#(B consonant "LETTER KHO KHUAT") ; 0xA3 (?,T$(B consonant "LETTER KHO KHWAI") ; 0xA4 (?,T%(B consonant "LETTER KHO KHON") ; 0xA5 (?,T&(B consonant "LETTER KHO RAKHANG") ; 0xA6 (?,T'(B consonant "LETTER NGO NGU") ; 0xA7 (?,T((B consonant "LETTER CHO CHAN") ; 0xA8 (?,T)(B consonant "LETTER CHO CHING") ; 0xA9 (?,T*(B consonant "LETTER CHO CHANG") ; 0xAA (?,T+(B consonant "LETTER SO SO") ; 0xAB (?,T,(B consonant "LETTER CHO CHOE") ; 0xAC (?,T-(B consonant "LETTER YO YING") ; 0xAD (?,T.(B consonant "LETTER DO CHADA") ; 0xAE (?,T/(B consonant "LETTER TO PATAK") ; 0xAF (?,T0(B consonant "LETTER THO THAN") ; 0xB0 (?,T1(B consonant "LETTER THO NANGMONTHO") ; 0xB1 (?,T2(B consonant "LETTER THO PHUTHAO") ; 0xB2 (?,T3(B consonant "LETTER NO NEN") ; 0xB3 (?,T4(B consonant "LETTER DO DEK") ; 0xB4 (?,T5(B consonant "LETTER TO TAO") ; 0xB5 (?,T6(B consonant "LETTER THO THUNG") ; 0xB6 (?,T7(B consonant "LETTER THO THAHAN") ; 0xB7 (?,T8(B consonant "LETTER THO THONG") ; 0xB8 (?,T9(B consonant "LETTER NO NU") ; 0xB9 (?,T:(B consonant "LETTER BO BAIMAI") ; 0xBA (?,T;(B consonant "LETTER PO PLA") ; 0xBB (?,T<(B consonant "LETTER PHO PHUNG") ; 0xBC (?,T=(B consonant "LETTER FO FA") ; 0xBD (?,T>(B consonant "LETTER PHO PHAN") ; 0xBE (?,T?(B consonant "LETTER FO FAN") ; 0xBF (?,T@(B consonant "LETTER PHO SAMPHAO") ; 0xC0 (?,TA(B consonant "LETTER MO MA") ; 0xC1 (?,TB(B consonant "LETTER YO YAK") ; 0xC2 (?,TC(B consonant "LETTER RO RUA") ; 0xC3 (?,TD(B vowel-base "LETTER RU (Pali vowel letter)") ; 0xC4 (?,TE(B consonant "LETTER LO LING") ; 0xC5 (?,TF(B vowel-base "LETTER LU (Pali vowel letter)") ; 0xC6 (?,TG(B consonant "LETTER WO WAEN") ; 0xC7 (?,TH(B consonant "LETTER SO SALA") ; 0xC8 (?,TI(B consonant "LETTER SO RUSI") ; 0xC9 (?,TJ(B consonant "LETTER SO SUA") ; 0xCA (?,TK(B consonant "LETTER HO HIP") ; 0xCB (?,TL(B consonant "LETTER LO CHULA") ; 0xCC (?,TM(B consonant "LETTER O ANG") ; 0xCD (?,TN(B consonant "LETTER HO NOK HUK") ; 0xCE (?,TO(B special "PAI YAN NOI (abbreviation)") ; 0xCF (?,TP(B vowel-base "VOWEL SIGN SARA A") ; 0xD0 (?,TQ(B vowel-upper "VOWEL SIGN MAI HAN-AKAT N/S-T") ; 0xD1 (?,TR(B vowel-base "VOWEL SIGN SARA AA") ; 0xD2 (?,TS(B vowel-base "VOWEL SIGN SARA AM") ; 0xD3 (?,TT(B vowel-upper "VOWEL SIGN SARA I N/S-T") ; 0xD4 (?,TU(B vowel-upper "VOWEL SIGN SARA II N/S-T") ; 0xD5 (?,TV(B vowel-upper "VOWEL SIGN SARA UE N/S-T") ; 0xD6 (?,TW(B vowel-upper "VOWEL SIGN SARA UEE N/S-T") ; 0xD7 (?,TX(B vowel-lower "VOWEL SIGN SARA U N/S-B") ; 0xD8 (?,TY(B vowel-lower "VOWEL SIGN SARA UU N/S-B") ; 0xD9 (?,TZ(B vowel-lower "VOWEL SIGN PHINTHU N/S-B (Pali virama)") ; 0xDA (?,T[(B invalid nil) ; 0xDA (?,T\(B invalid nil) ; 0xDC (?,T](B invalid nil) ; 0xDC (?,T^(B invalid nil) ; 0xDC (?,T_(B special "BAHT SIGN (currency symbol)") ; 0xDF (?,T`(B vowel-base "VOWEL SIGN SARA E") ; 0xE0 (?,Ta(B vowel-base "VOWEL SIGN SARA AE") ; 0xE1 (?,Tb(B vowel-base "VOWEL SIGN SARA O") ; 0xE2 (?,Tc(B vowel-base "VOWEL SIGN SARA MAI MUAN") ; 0xE3 (?,Td(B vowel-base "VOWEL SIGN SARA MAI MALAI") ; 0xE4 (?,Te(B vowel-base "LAK KHANG YAO") ; 0xE5 (?,Tf(B special "MAI YAMOK (repetion)") ; 0xE6 (?,Tg(B vowel-upper "VOWEL SIGN MAI TAI KHU N/S-T") ; 0xE7 (?,Th(B tone "TONE MAI EK N/S-T") ; 0xE8 (?,Ti(B tone "TONE MAI THO N/S-T") ; 0xE9 (?,Tj(B tone "TONE MAI TRI N/S-T") ; 0xEA (?,Tk(B tone "TONE MAI CHATTAWA N/S-T") ; 0xEB (?,Tl(B tone "THANTHAKHAT N/S-T (cancellation mark)") ; 0xEC (?,Tm(B tone "NIKKHAHIT N/S-T (final nasal)") ; 0xED (?,Tn(B vowel-upper "YAMAKKAN N/S-T") ; 0xEE (?,To(B special "FONRMAN") ; 0xEF (?,Tp(B special "DIGIT ZERO") ; 0xF0 (?,Tq(B special "DIGIT ONE") ; 0xF1 (?,Tr(B special "DIGIT TWO") ; 0xF2 (?,Ts(B special "DIGIT THREE") ; 0xF3 (?,Tt(B special "DIGIT FOUR") ; 0xF4 (?,Tu(B special "DIGIT FIVE") ; 0xF5 (?,Tv(B special "DIGIT SIX") ; 0xF6 (?,Tw(B special "DIGIT SEVEN") ; 0xF7 (?,Tx(B special "DIGIT EIGHT") ; 0xF8 (?,Ty(B special "DIGIT NINE") ; 0xF9 (?,Tz(B special "ANGKHANKHU (ellipsis)") ; 0xFA (?,T{(B special "KHOMUT (beginning of religious texts)") ; 0xFB (?,T|(B invalid nil) ; 0xFC (?,T}(B invalid nil) ; 0xFD (?,T~(B invalid nil) ; 0xFE )) elm) (while l (setq elm (car l) l (cdr l)) (let ((char (car elm)) (ptype (nth 1 elm))) (put-char-code-property char 'phonetic-type ptype) (cond ((eq ptype 'consonant) (modify-category-entry char ?c thai-category-table)) ((memq ptype '(vowel-upper vowel-lower)) (modify-category-entry char ?v thai-category-table)) ((eq ptype 'tone) (modify-category-entry char ?t thai-category-table))) (put-char-code-property char 'name (nth 2 elm))))) ;;;###autoload (defun thai-compose-region (beg end) "Compose Thai characters in the region. When called from a program, expects two arguments, positions (integers or markers) specifying the region." (interactive "r") (save-restriction (narrow-to-region beg end) (goto-char (point-min)) (with-category-table thai-category-table (while (re-search-forward thai-composition-pattern nil t) (compose-region (match-beginning 0) (match-end 0)))))) ;;;###autoload (defun thai-compose-string (string) "Compose Thai characters in STRING and return the resulting string." (with-category-table thai-category-table (let ((idx 0)) (while (setq idx (string-match thai-composition-pattern string idx)) (compose-string string idx (match-end 0)) (setq idx (match-end 0))))) string) ;;;###autoload (defun thai-compose-buffer () "Compose Thai characters in the current buffer." (interactive) (thai-compose-region (point-min) (point-max))) ;;;###autoload (defun thai-post-read-conversion (len) (thai-compose-region (point) (+ (point) len)) len) ;;;###autoload (defun thai-composition-function (from to pattern &optional string) "Compose Thai text in the region FROM and TO. The text matches the regular expression PATTERN. Optional 4th argument STRING, if non-nil, is a string containing text to compose. The return value is number of composed characters." (if (< (1+ from) to) (prog1 (- to from) (if string (compose-string string from to) (compose-region from to)) (- to from)))) ;; (provide 'thai-util) ;;; thai-util.el ends here