Mercurial > hg > xemacs-beta
view lisp/mule/thai-util.el @ 4967:0d4c9d0f6a8d
rewrite dynarr code
-------------------- ChangeLog entries follow: --------------------
src/ChangeLog addition:
2010-02-03 Ben Wing <ben@xemacs.org>
* device-x.c (x_get_resource_prefix):
* device-x.c (Fx_get_resource):
* device-x.c (Fx_get_resource_prefix):
* device-x.c (Fx_put_resource):
* dialog-msw.c:
* dialog-msw.c (handle_question_dialog_box):
* dired-msw.c (mswindows_sort_files):
* dired-msw.c (mswindows_get_files):
* extents.c (extent_fragment_sort_by_priority):
* extents.c (Fset_extent_parent):
* file-coding.c (coding_reader):
* file-coding.c (coding_writer):
* file-coding.c (gzip_convert):
* frame.c (generate_title_string):
* gutter.c (calculate_gutter_size_from_display_lines):
* indent.c (vmotion_1):
* lread.c (read_bit_vector):
* mule-coding.c (iso2022_decode):
* rangetab.c:
* rangetab.c (Fcopy_range_table):
* rangetab.c (Fget_range_table):
* rangetab.c (unified_range_table_copy_data):
* redisplay-msw.c (mswindows_output_string):
* redisplay-output.c (output_display_line):
* redisplay-output.c (redisplay_move_cursor):
* redisplay-output.c (redisplay_clear_bottom_of_window):
* redisplay-tty.c (tty_output_ichar_dynarr):
* redisplay-tty.c (set_foreground_to):
* redisplay-tty.c (set_background_to):
* redisplay-xlike-inc.c (XLIKE_output_string):
* redisplay.c (redisplay_window_text_width_string):
* redisplay.c (redisplay_text_width_string):
* redisplay.c (create_text_block):
* redisplay.c (SET_CURRENT_MODE_CHARS_PIXSIZE):
* redisplay.c (generate_fstring_runes):
* redisplay.c (regenerate_modeline):
* redisplay.c (ensure_modeline_generated):
* redisplay.c (real_current_modeline_height):
* redisplay.c (create_string_text_block):
* redisplay.c (regenerate_window):
* redisplay.c (REGEN_INC_FIND_START_END):
* redisplay.c (point_visible):
* redisplay.c (redisplay_window):
* redisplay.c (mark_glyph_block_dynarr):
* redisplay.c (line_start_cache_start):
* redisplay.c (start_with_line_at_pixpos):
* redisplay.c (update_line_start_cache):
* redisplay.c (glyph_to_pixel_translation):
* redisplay.c (pixel_to_glyph_translation):
* sysdep.c (qxe_readdir):
* text.c (dfc_convert_to_external_format):
* text.c (dfc_convert_to_internal_format):
* toolbar-common.c (common_output_toolbar_button):
* window.c (window_modeline_height):
* window.c (Fwindow_last_line_visible_height):
* window.c (window_displayed_height):
* window.c (window_scroll):
* window.c (get_current_pixel_pos):
Use Dynarr_begin() in place of Dynarr_atp (foo, 0).
* dynarr.c (Dynarr_realloc):
* dynarr.c (Dynarr_lisp_realloc):
* dynarr.c (Dynarr_resize):
* dynarr.c (Dynarr_insert_many):
* dynarr.c (Dynarr_delete_many):
* dynarr.c (Dynarr_memory_usage):
* dynarr.c (stack_like_malloc):
* dynarr.c (stack_like_free):
* lisp.h:
* lisp.h (DECLARE_DYNARR_LISP_IMP):
* lisp.h (XD_DYNARR_DESC):
* lisp.h (Dynarr_pop):
* gutter.c (output_gutter):
* redisplay-output.c (sync_rune_structs):
* redisplay-output.c (redisplay_output_window):
Redo the dynarr code, add greater checks.
Rename the `len', `largest' and `max' members to `len_',
`largest_' and `max_' to try and catch existing places that might
directly modify these values. Make new accessors Dynarr_largest()
and Dynarr_max() and make them and existing Dynarr_length() be
non-lvalues by adding '+ 0' to them; fix a couple of places in the
redisplay code that tried to modify the length directly by setting
Dynarr_length(). Use the accessors whenever possible even in the
dynarr code itself. The accessors also verify that 0 <= len <=
largest <= max. Rename settor function Dynarr_set_size() to
Dynarr_set_length() and use it more consistently; also create
lower-level Dynarr_set_length_1(). This latter function should be
the only function that directly modifies the `len_' member of a
Dynarr, and in the process makes sure that the `largest' value is
kept correct.
Consistently use ERROR_CHECK_STRUCTURES instead of
ERROR_CHECK_TYPES for error-checking code. Reintroduce the
temporarily disabled verification code on the positions of
Dynarr_at(), Dynarr_atp() and Dynarr_atp_past_end().
Also create Dynarr_resize_if() in place of a repeated
code fragment. Clean up all the functions that modify Dynarrs to
use the new macros and functions and verify the correctness of the
Dynarr both before and after the change.
Note that there are two kinds of verification -- one for accessing
and one for modifying. The difference is that the modify
verification additionally checks to make sure that the Dynarr
isn't locked. (This is used in redisplay to check for problems
with reentrancy.)
* lrecord.h: Move XD_DYNARR_DESC to lisp.h, grouping with the dynarr code.
author | Ben Wing <ben@xemacs.org> |
---|---|
date | Wed, 03 Feb 2010 20:51:18 -0600 |
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