Spelling fixes.

[bpt/emacs.git] / lisp / language / tibetan.el

diff --git a/lisp/language/tibetan.el b/lisp/language/tibetan.el
index b22bfd6..c80b22c 100644 (file)
--- a/lisp/language/tibetan.el
+++ b/lisp/language/tibetan.el
@@ -1,15 +1,16 @@
 ;;; tibetan.el --- support for Tibetan language -*- coding: iso-2022-7bit; -*-
 
-;; Copyright (C) 1997, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008
-;;   Free Software Foundation, Inc.
+;; Copyright (C) 1997, 2001-2011  Free Software Foundation, Inc.
 ;; Copyright (C) 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005,
-;;   2006, 2007, 2008
+;;   2006, 2007, 2008, 2009, 2010, 2011
 ;;   National Institute of Advanced Industrial Science and Technology (AIST)
 ;;   Registration Number H14PRO021
 ;; Copyright (C) 2003
 ;;   National Institute of Advanced Industrial Science and Technology (AIST)
 ;;   Registration Number H13PRO009
 
+;; Author: Toru TOMABECHI <Toru.Tomabechi@orient.unil.ch>
+;; Created: Feb. 17. 1997
 ;; Keywords: multilingual, Tibetan, i18n
 
 ;; This file is part of GNU Emacs.
@@ -27,11 +28,8 @@
 ;; You should have received a copy of the GNU General Public License
 ;; along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
 
-;; Author: Toru TOMABECHI, <Toru.Tomabechi@orient.unil.ch>
-
-;; Created: Feb. 17. 1997
+;;; History:
 
-;; History:
 ;; 1997.03.13 Modification for special signs and punctuations.
 
 ;;; Commentary:
@@ -103,7 +101,7 @@
             (input-method . "tibetan-wylie")
             (features tibet-util)
             (documentation . t)
-            (sample-text "Tibetan (\e$(7"7"]"2!;"G#!"Q"2!;\e(B) \e$(7!4!5!5!>"7"!#C"Q!;"E"S"G!;"7"2"[!;"D"["#"G!>"I"]"_!;"9"Q!;"/"S!;"5"Q"2#9"[!;"H"A"U"c!>\e(B")))
+            (sample-text . "Tibetan (\e$(7"7"]"2!;"G#!"Q"2!;\e(B) \e$(7!4!5!5!>"7"!#C"Q!;"E"S"G!;"7"2"[!;"D"["#"G!>"I"]"_!;"9"Q!;"/"S!;"5"Q"2#9"[!;"H"A"U"c!>\e(B")))
 
 ;; `\e$(7"A\e(B' is included in the pattern for subjoined consonants because we
 ;; treat it specially in tibetan-add-components.
@@ -426,7 +424,7 @@
     ))
 
 ;;; alist for Tibetan composite vowels (long i, vocalic r, etc.)
-;;; New varialble. created by Tomabechi 2000/06/08
+;;; New variable. created by Tomabechi 2000/06/08
 (defconst tibetan-composite-vowel-alist
   '(;; LONG A
     ;; ("\e$(7"R\e(B" . ((bc . tc) ?\e$(7"R\e(B))
@@ -569,6 +567,7 @@ The result of matching is to be used for indexing alists at conversion
 from a roman transcription to the corresponding Tibetan character.")
 
 (defvar tibetan-precomposed-regexp
+  (purecopy
   (let ((l tibetan-precomposed-transcription-alist)
        temp)
     (setq temp "^\\(")
@@ -579,12 +578,13 @@ from a roman transcription to the corresponding Tibetan character.")
       (setq temp
            (concat temp "\\|" (car (car l))))
       (setq l (cdr l)))
-    (concat temp "\\)"))
+    (concat temp "\\)")))
   "Regexp string to match a romanized Tibetan complex consonant.
 The result of matching is to be used for indexing alists when the input key
 from an input method is converted to the corresponding precomposed glyph.")
 
 (defvar tibetan-precomposition-rule-regexp
+  (purecopy
   (let ((l tibetan-precomposition-rule-alist)
        temp)
     (setq temp "\\(")
@@ -593,7 +593,7 @@ from an input method is converted to the corresponding precomposed glyph.")
     (while l
       (setq temp (concat temp "\\|" (car (car l))))
       (setq l (cdr l)))
-    (concat temp "\\)"))
+    (concat temp "\\)")))
   "Regexp string to match a sequence of Tibetan consonantic components, i.e.,
 one base consonant and one or more subjoined consonants.
 The result of matching is to be used for indexing alist when the component
@@ -604,10 +604,10 @@ This also matches some punctuation characters which need conversion.")
 (defvar tibetan-decomposed-temp nil)
 
 ;; For automatic composition.
-(set-char-table-range composition-function-table '(#xF00 . #xFD1)
-                     '(("[\xF00-\xFD1]+" . tibetan-composition-function)))
+(set-char-table-range
+ composition-function-table '(#xF00 . #xFD1)
+ (list (vector tibetan-composable-pattern 0 'font-shape-gstring)))
 
 (provide 'tibetan)
 
-;; arch-tag: 8d37c8d7-f95d-450f-9ec2-819e61fc79a7
 ;;; tibetan.el ends here