Merge from emacs-24; up to 2012-05-02T07:12:52Z!rgm@gnu.org.

[gnu-emacs] / lisp / language / tibet-util.el

diff --git a/lisp/language/tibet-util.el b/lisp/language/tibet-util.el
index d79a20a024e306cebafd791494af16d99a09acb2..f6dd15bf222674027ef1a8d00bc55b7cde9900fe 100644 (file)
--- a/lisp/language/tibet-util.el
+++ b/lisp/language/tibet-util.el
@@ -1,20 +1,21 @@
 ;;; tibet-util.el --- utilities for Tibetan   -*- coding: iso-2022-7bit; -*-
 
-;; Copyright (C) 1997, 2001, 2002, 2003, 2004, 2005, 2006, 2007
-;;   Free Software Foundation, Inc.
+;; Copyright (C) 1997, 2001-2012  Free Software Foundation, Inc.
 ;; Copyright (C) 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004,
-;;   2005, 2006, 2007
+;;   2005, 2006, 2007, 2008, 2009, 2010, 2011
 ;;   National Institute of Advanced Industrial Science and Technology (AIST)
 ;;   Registration Number H14PRO021
 
+;; Author: Toru TOMABECHI <Toru.Tomabechi@orient.unil.ch>
 ;; Keywords: multilingual, Tibetan
+;; Created: Feb. 17. 1997
 
 ;; This file is part of GNU Emacs.
 
-;; GNU Emacs is free software; you can redistribute it and/or modify
+;; GNU Emacs 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.
+;; the Free Software Foundation, either version 3 of the License, or
+;; (at your option) any later version.
 
 ;; GNU Emacs is distributed in the hope that it will be useful,
 ;; but WITHOUT ANY WARRANTY; without even the implied warranty of
@@ -22,17 +23,11 @@
 ;; GNU General Public License for more details.
 
 ;; You should have received a copy of the GNU General Public License
-;; along with GNU Emacs; see the file COPYING.  If not, write to the
-;; Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
-;; Boston, MA 02110-1301, USA.
-
-;; Author: Toru TOMABECHI, <Toru.Tomabechi@orient.unil.ch>
-
-;; Created: Feb. 17. 1997
+;; along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
 
 ;;; History:
 ;; 1997.03.13 Modification in treatment of text properties;
-;;            Support for some special signs and punctuations.
+;;            Support for some special signs and punctuation.
 ;; 1999.10.25 Modification for a new composition way by K.Handa.
 
 ;;; Commentary:
@@ -40,13 +35,13 @@
 ;;; Code:
 
 (defconst tibetan-obsolete-glyphs
-  `(("\e$(7!=\e(B" . "\e$(8!=\e(B")                        ; 2 col <-> 1 col
-    ("\e$(7!?\e(B" . "\e$(8!?\e(B")
-    ("\e$(7!@\e(B" . "\e$(8!@\e(B")
-    ("\e$(7!A\e(B" . "\e$(8!A\e(B")
-    ("\e$(7"`\e(B" . "\e$(8"`\e(B")
-    ("\e$(7!;\e(B" . "\e$(8!;\e(B")
-    ("\e$(7!D\e(B" . "\e$(8!D\e(B")
+  `(("\e$(7!=\e(B" . "\e$(7!=\e(B")                        ; 2 col <-> 1 col
+    ("\e$(7!?\e(B" . "\e$(7!?\e(B")
+    ("\e$(7!@\e(B" . "\e$(7!@\e(B")
+    ("\e$(7!A\e(B" . "\e$(7!A\e(B")
+    ("\e$(7"`\e(B" . "\e$(7"`\e(B")
+    ("\e$(7!;\e(B" . "\e$(7!;\e(B")
+    ("\e$(7!D\e(B" . "\e$(7!D\e(B")
     ;; Yes these are dirty. But ...
     ("\e$(7!>\e(B \e$(7!>\e(B" . ,(compose-string "\e$(7!>\e(B \e$(7!>\e(B" 0 3 [?\e$(7!>\e(B (Br . Bl) ?  (Br . Bl) ?\e$(7!>\e(B]))
     ("\e$(7!4!5!5\e(B" . ,(compose-string
@@ -141,7 +136,7 @@ The returned string has no composition information."
 ;;;
 ;;; Here are examples of the words "bsgrubs" and "hfauM"
 ;;;
-;;;            \e4\e$(7"7\e0"7\e1\e4%qx!"U\e0"G###C"U\e1\e4"7\e0"7\e1\e4"G\e0"G\e1\e(B            \e4\e$(7"Hx!"Rx!"Ur'"_\e0"H"R"U"_\e1\e(B
+;;;            \e$(7"7"G###C"U"7"G\e(B            \e$(7"H"R"U"_\e(B
 ;;;
 ;;;                             M
 ;;;             b s b s         h
@@ -167,7 +162,7 @@ The returned string has no composition information."
     ;; If 'a follows a consonant, turn it into the subjoined form.
     ;; * Disabled by Tomabechi 2000/06/09 *
     ;; Because in Unicode, \e$(7"A\e(B may follow directly a consonant without
-    ;; any intervening vowel, as in \e4\e$(7"9\e0"9\e1\e4""\e0"""Q\e1\e4"A\e0"A\e1!;\e(B=\e4\e$(7"9\e0"9\e1\e(B \e4\e$(7""\e0""\e1\e(B \e4\e$(7"A\e0"A\e1\e(B not \e4\e$(7"9\e0"9\e1\e(B \e4\e$(7""\e0""\e1\e(B \e$(7"Q\e(B \e4\e$(7"A\e0"A\e1\e(B
+    ;; any intervening vowel, as in \e$(7"9"""Q"A!;\e(B=\e$(7"9\e(B \e$(7""\e(B \e$(7"A\e(B not \e$(7"9\e(B \e$(7""\e(B \e$(7"Q\e(B \e$(7"A\e(B
     ;;(if (and (= char ?\e$(7"A\e(B)
     ;;      (aref (char-category-set (car last)) ?0))
     ;; (setq char ?\e$(7"R\e(B)) ;; modified for new font by Tomabechi 1999/12/10
@@ -189,7 +184,8 @@ The returned string has no composition information."
 
      ;; Compose lower vowel sign vertically under.
      ((aref (char-category-set char) ?3)
-      (if (eq char ?\e$(7"Q\e(B)         ;; `\e$(7"Q\e(B' should not visible when composed.
+      (if (or (eq char ?\e$(7"Q\e(B) ;; `\e$(7"Q\e(B' and `\e$,1FP\e(B' should not visible when composed.
+             (eq char #xF70))
          (setq rule nil)
        (setq rule stack-under)))
      ;; Transform ra-mgo (superscribed r) if followed by a subjoined
@@ -314,13 +310,6 @@ are decomposed into normal Tibetan character sequences."
            idx (1+ idx)))
     new))
 
-;;;###autoload
-(defun tibetan-composition-function (from to pattern &optional string)
-  (if string
-      (tibetan-compose-string string)
-    (tibetan-compose-region from to))
-  (- to from))
-
 ;;;
 ;;; This variable is used to avoid repeated decomposition.
 ;;;
@@ -409,7 +398,7 @@ See also docstring of the function tibetan-compose-region."
        ))))
 
 (defvar tibetan-strict-unicode t
-  "*Flag to control Tibetan canonicalizing for Unicode.
+  "Flag to control Tibetan canonicalizing for Unicode.
 
 If non-nil, the vowel a is removed and composite vowels are decomposed
 before writing buffer in Unicode.  See also
@@ -431,5 +420,4 @@ before writing buffer in Unicode.  See also
 
 (provide 'tibet-util)
 
-;;; arch-tag: 7a7333e8-1584-446c-b39c-a02b9def265d
 ;;; tibet-util.el ends here