Mercurial > hg > xemacs-beta
view lisp/mule/indian.el @ 4995:8431b52e43b1
Move the various map* functions to C; add #'map-into.
src/ChangeLog addition:
2010-01-31 Aidan Kehoe <kehoea@parhasard.net>
Move #'mapcar*, #'mapcan, #'mapc, #'map, #'mapl, #'mapcon to C;
extend #'mapvector, #'mapconcat, #'mapcar to support more
SEQUENCES; have them all error with circular lists.
* fns.c (Fsubseq): Call CHECK_SEQUENCE here; Flength can return
from the debugger if it errors with a non-sequence, leading to a
crash in Fsubseq if sequence really is *not* a sequence.
(mapcarX): Rename mapcar1 to mapcarX; rework it comprehensively to
take an optional lisp output argument, and a varying number of
sequences.
Special-case a single list argument, as we used to, saving its
elements in the stack space for the results before calling
FUNCTION, so FUNCTION can corrupt the list all it
wants. dead_wrong_type_argument() in the other cases if we
encounter a non-cons where we expected a cons.
(Fmapconcat):
Accept further SEQUENCES after separator here. Special-case
the idiom (mapconcat 'identity SEQUENCE), don't even funcall.
(FmapcarX): Rename this from Fmapcar. Accept optional SEQUENCES.
(Fmapvector): Accept optional SEQUENCES.
(Fmapcan, Fmapc, Fmap): Move these here from cl-extra.el.
(Fmap_into): New function, as specified by Common Lisp.
(maplist): New function, the guts of the implementation of
Fmaplist and Fmapl.
(Fmaplist, Fmapl, Fmapcon): Move these from cl-extra.el.
(syms_of_fns):
Add a few needed symbols here, for the type tests
used by #'map. Add the new subrs, with aliases for #'mapc-internal
and #'mapcar.
* general-slots.h: Declare Qcoerce here, now it's used in both
indent.c and fns.c
* indent.c (syms_of_indent): Qcoerce is gone from here.
* lisp.h: Add ARRAYP(), SEQUENCEP(), and the corresponding CHECK_*
macros. Declare Fbit_vector, Fstring, FmapcarX, now other files
need to use them.
* data.c (Farrayp, Fsequencep): Use ARRAYP and SEQUENCEP, just
added to lisp.h
* buffer.c (Fbuffer_list): Now Fmapcar has been renamed FmapcarX
and takes MANY arguments, update this function to reflect that.
lisp/ChangeLog addition:
2010-01-31 Aidan Kehoe <kehoea@parhasard.net>
* cl.el (mapcar*): Delete; this is now in fns.c.
Use #'mapc, not #'mapc-internal in a couple of places.
* cl-macs.el (mapc, mapcar*, map): Delete these compiler macros
now the corresponding functions are in fns.c; there's no run-time
advantage to the macros.
* cl-extra.el (coerce): Extend the possible conversions here a
little; it's not remotely comprehensive yet, though it does allow
running slightly more Common Lisp code than previously.
(cl-mapcar-many): Delete.
(map, maplist, mapc, mapl, mapcan, mapcon): Move these to fns.c.
* bytecomp.el (byte-compile-maybe-mapc):
Use #'mapc itself, not #'mapc-internal, now the former is in C.
(mapcar*): Use #'byte-compile-maybe-mapc as this function's
byte-compile method, now a #'mapc that can take more than one
sequence is in C.
* obsolete.el (cl-mapc): Move this compatibility alias to this file.
* update-elc.el (do-autoload-commands): Use #'mapc, not
#'mapc-internal here.
author | Aidan Kehoe <kehoea@parhasard.net> |
---|---|
date | Sun, 31 Jan 2010 18:29:48 +0000 |
parents | 98af8a976fc3 |
children | 3889ef128488 308d34e9f07d |
line wrap: on
line source
;;; indian.el --- support for Indian Languages -*- coding: iso-2022-7bit; -*- ;; Copyright (C) 1995 Free Software Foundation, Inc. ;; Author: KAWABATA, Taichi <kawabata@is.s.u-tokyo.ac.jp> ;; Keywords: multilingual, Indian ;; 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/indian.el). ;;; Commentary: ;; History: ;; 1996.10.18 written by KAWABATA, Taichi <kawabata@is.s.u-tokyo.ac.jp> ;; For Indian, the character set IS 13194 is supported. ;; ;; IS 13194 does not specifically assign glyphs for each characters. ;; Following code is not specific to each Indian language. ;; ;; Eventually, this code will support generic information about ;; following scripts. ;; ;; Devanagari ;; Bengali ;; Gurmukhi ;; Gujarati ;; Oriya ;; Tamil ;; Telgu ;; Kannada ;; Malayalam ;; ;; In this file, charsets other than charset-ascii and charset-indian-is13194 ;; should not be used except in the comment. ;;; Code: ;; Followings are what you see when you refer to the Emacs ;; representations of IS 13194 charcters. However, this is merely ;; tentative apperance, and you must convert them by ;; indian-to-xxxxxx(specific script) function to use them. ;; Devanagari is not an exception of this rule. ;; 0xa0 //(5!"#$%&'()*+,-./(B ;; 0xb0 (50123456789:;<=>?(B ;; 0xc0 (5@ABCDEFGHIJKLMNO(B ;; 0xd0 (5PQRSTUVWXYZ[\]^_(B ;; 0xe0 (5`abcdefghijklmno(B ;; 0xf0 (5pqrstuvwxyz{|}~(B// ;; Note - In IS 13194, several symbols are obtained by special ;; combination of several characters and Nukta sign. ;; ;; Sanskrit Vowel R -> (5*(B + (5i(B ;; Sanskrit Vowel L -> (5&(B + (5i(B ;; Sanskrit Vowel LL -> (5'(B + (5i(B ;; Sanskrit Avagrah -> (5j(B + (5i(B ;; OM -> (5!(B + (5i(B ;; ;; Note - IS 13194 defines ATR(0xEF) and EXT(0xF0), but they are ;; not used in Emacs. ;; ;; Note - the above characters DO NOT represent any script. For ;; example, if you want to obtain Devanagari character, you must do ;; something like the following. ;; ;; (char-to-string (indian-to-devanagari ?(5$(B)) ;; "$(5!$(B" ;;; ITRANS ;; ;; ITRANS is one of the most popular method to exchange indian scripts ;; electronically. Here is the table to convert between ITRANS code and ;; IS 13194 code. ;; Indian scripts. Symbolic charset for data exchange. Glyphs are ;; not assigned. They are automatically converted to each Indian ;; script which IS-13194 supports. (make-charset 'indian-is13194 "Generic Indian charset for data exchange with IS 13194" '(dimension 1 registries ["IS13194-Devanagari"] chars 94 columns 2 direction l2r final ?5 graphic 1 short-name "IS 13194" long-name "Indian IS 13194" )) ;; Actual Glyph for 1-column width. (make-charset 'indian-1-column "Indian charset for 2-column width glyphs" '(dimension 2 registries ["MuleIndian-1"] chars 94 columns 1 direction l2r final ?6 graphic 0 short-name "Indian 1-col" long-name "Indian 1 Column" )) ;; Actual Glyph for 2-column width. (make-charset 'indian-2-column "Indian charset for 2-column width glyphs" '(dimension 2 registries ["MuleIndian-2"] chars 94 columns 2 direction l2r final ?5 graphic 0 short-name "Indian 2-col" long-name "Indian 2 Column" )) (defvar indian-itrans-consonant-alist '( ("k" . "(53(B") ("kh" . "(54(B") ("g" . "(55(B") ("gh" . "(56(B") ("N^" . "(57(B") ("ch" . "(58(B") ("chh" . "(59(B") ("j" . "(5:(B") ("jh" . "(5;(B") ("JN" . "(5<(B") ("T" . "(5=(B") ("Th" . "(5>(B") ("D" . "(5?(B") ("Dh" . "(5@(B") ("N" . "(5A(B") ("t" . "(5B(B") ("th" . "(5C(B") ("d" . "(5D(B") ("dh" . "(5E(B") ("n" . "(5F(B") ("nh" . "(5G(B") ; For transcription of non-Devanagari Languages. ("p" . "(5H(B") ("ph" . "(5I(B") ("b" . "(5J(B") ("bh" . "(5K(B") ("m" . "(5L(B") ("y" . "(5M(B") ("yh" . "(5N(B") ; For transcription of non-Devanagari Languages. ("r" . "(5O(B") ("rh" . "(5P(B") ; For transcription of non-Devanagari Languages. ("l" . "(5Q(B") ("v" . "(5T(B") ("sh" . "(5U(B") ("shh" . "(5V(B") ("s" . "(5W(B") ("h" . "(5X(B") ("ld" . "(5R(B") ("L" . "(5R(B") ("ksh" . "$(5!3!h!V(B") ("GY" . "***GY***") ; Must check out later. ;; special consonants ("q" . "(53i(B") ("K" . "(54i(B") ("G" . "(55i(B") ("z" . "(5:i(B") ("f" . "(5Ii(B") (".D" . "(5?i(B") (".Dh" . "(5@i(B") )) (defvar indian-itrans-vowel-sign-alist '( ;; Special treatment unique to IS 13194 Transliteration ("" . "(5h(B") ("a" . "") ;; Matra (Vowel Sign) ("aa" . "(5Z(B") ("A" . "(5Z(B") ("i" . "(5[(B") ("ii" . "(5\(B") ("I" . "(5\(B") ("u" . "(5](B") ("uu" . "(5^(B") ("U" . "(5^(B") ("R^i" . "(5_(B") ; These must be checked out later. ("R^I" . "(5_i(B") ("L^i" . "(5[i(B") ("L^I" . "(5\i(B") ("E" . "(5`(B") ; For transcription of non-Devanangri Languages. ("e" . "(5a(B") ("ai" . "(5b(B") ;; ("e.c" . "(5c(B") ; Tentatively suppressed. ("O" . "(5d(B") ; For transcription of non-Devanagari Languages. ("o" . "(5e(B") ("au" . "(5f(B") ;; ("o.c" . "(5g(B") ; Tentatively suppressed. )) ;; ;; Independent vowels and other signs. ;; (defvar indian-itrans-other-letters-alist '( ("a" . "(5$(B") ("aa" . "(5%(B") ("A" . "(5%(B") ("i" . "(5&(B") ("ii" . "(5'(B") ("I" . "(5'(B") ("u" . "(5((B") ("uu" . "(5)(B") ("U" . "(5)(B") ("R^i" . "(5*(B") ("R^I" . "(5*i(B") ("L^i" . "(5&i(B") ("L^I" . "(5'i(B") ("E" . "(5+(B") ; For transcription of non-Devanagari Languages. ("e" . "(5,(B") ("ai" . "(5-(B") ;; ("e.c" . "(5.(B") ; Candra E ("O" . "(5/(B") ; For transcription of non-Devanagari Languages. ("o" . "(50(B") ("au" . "(51(B") ;; ("o.c" . "(52(B") ; Candra O ("M" . "(5$(B") ("H" . "(5#(B") ("AUM" . "(5!i(B") ("OM" . "(5!i(B") (".r" . "(5Oh(B") (".n" . "(5"(B") (".N" . "(5!(B") (".h" . "(5h(B") ; Halant (".." . "(5j(B") (".a" . "(5ji(B") ; Avagrah ("0" . "(5q(B") ("1" . "(5r(B") ("2" . "(5s(B") ("3" . "(5t(B") ("4" . "(5u(B") ("5" . "(5v(B") ("6" . "(5w(B") ("7" . "(5x(B") ("8" . "(5y(B") ("9" . "(5z(B") )) ;; Regular expression matching single Indian character represented ;; by ITRANS. (defvar indian-itrans-regexp (let ((consonant "\\([cs]hh?\\)\\|[kgjTDnpbyr]h?\\|\\(N\\^?\\)\\|\\(jN\\)\\|[mvqKGzfs]\\|\\(ld?\\)\\|\\(ksh\\)\\|\\(GY\\)\\|\\(\\.Dh?\\)") (vowel "\\(a[aiu]\\)\\|\\(ii\\)\\|\\(uu\\)\\|\\([RL]\\^[iI]\\)\\|[AIEOeoaiu]") (misc "[MH0-9]\\|\\(AUM\\)\\|\\(OM\\)\\|\\(\\.[rnNh\\.a]\\)") (lpre "\\(") (rpre "\\)") (orre "\\|")) (concat lpre misc rpre orre lpre lpre consonant rpre "?" lpre vowel rpre rpre orre lpre consonant rpre ))) ;; ;; Regular expression matching single ITRANS unit for IS 13194 characters. ;; (defvar itrans-indian-regexp (let ((vowel "[(5$(B-(52(B]") (consonant "[(53(B-(5X(B]") (matra "[(5Z(B-(5g(B]") (misc "[(5q(B-(5z(B]") (lpre "\\(") (rpre "\\)") (orre "\\|")) (concat misc orre lpre consonant matra "?" rpre orre vowel))) ;; ;; IS13194 - ITRANS conversion table for string matching above regexp. ;; (defvar indian-itrans-alist (let ((cl indian-itrans-consonant-alist) (ml indian-itrans-other-letters-alist) rules) (while cl (let ((vl indian-itrans-vowel-sign-alist)) (while vl (setq rules (cons (cons (concat (car (car cl)) (car (car vl))) (concat (cdr (car cl)) (cdr (car vl)))) rules)) (setq vl (cdr vl)))) (setq cl (cdr cl))) (while ml (setq rules (cons (cons (car (car ml)) (cdr (car ml))) rules)) (setq ml (cdr ml))) rules)) ;; ;; Utility program to convert from ITRANS to IS 13194 in specified region. ;; (defun indian-decode-itrans-region (from to) "Convert `ITRANS' mnemonics of the current region to Indian characters. When called from a program, expects two arguments, positions (integers or markers) specifying the stretch of the region." (interactive "r") (save-restriction (narrow-to-region from to) (goto-char (point-min)) (while (re-search-forward indian-itrans-regexp nil t) (let* ((itrans (buffer-substring (match-beginning 0) (match-end 0))) (ch (cdr (assoc itrans indian-itrans-alist)))) (if ch (progn (delete-region (match-beginning 0) (match-end 0)) (insert ch))))) (goto-char (point-min)) (while (re-search-forward "\\((5h(B\\)[^\\c0]" nil t) (delete-region (match-beginning 1) (match-end 1))))) ;; ;; Utility program to convert from IS 13194 to ITRANS in specified region. ;; (defun indian-encode-itrans-region (from to) "Convert indian region to ITRANS mnemonics." (interactive "r") (save-restriction (narrow-to-region from to) (goto-char (point-min)) (while (re-search-forward itrans-indian-regexp nil t) (let* ((indian (buffer-substring (match-beginning 0) (match-end 0))) (ch (car (rassoc indian indian-itrans-alist)))) (if ch (progn (delete-region (match-beginning 0) (match-end 0)) (insert ch))))) (goto-char (point-min)))) (provide 'indian) ;;; indian.el ends here