Remove some face aliases obsoleted in 22.1

[gnu-emacs] / lisp / language / sinhala.el

diff --git a/lisp/language/sinhala.el b/lisp/language/sinhala.el
index 7b470c9c32e45425dbbe939933a73a6c99144d26..037d753f52acb814cc0581edac06575c74982f02 100644 (file)
--- a/lisp/language/sinhala.el
+++ b/lisp/language/sinhala.el
@@ -1,6 +1,6 @@
-;;; sinhala.el --- support for Sinhala -*- coding: utf-8; no-byte-compile: t -*-
+;;; sinhala.el --- support for Sinhala -*- coding: utf-8 -*-
 
-;; Copyright (C) 2008
+;; Copyright (C) 2008, 2009, 2010, 2011
 ;;   National Institute of Advanced Industrial Science and Technology (AIST)
 ;;   Registration Number H13PRO009
 
@@ -8,10 +8,10 @@
 
 ;; 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 3, 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
@@ -19,9 +19,7 @@
 ;; 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.
+;; along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
 
 ;;; Code:
 
@@ -35,7 +33,16 @@
 (set-char-table-range 
  composition-function-table
  '(#xD80 . #xDFF)
- (list (cons "[\xD80-\xDFF\x200C\x200D]+" 'font-shape-text)))
+ (list (vector
+       ;; C:consonant, H:HALANT, J:ZWJ, v:vowel sign,
+       ;; V:independent vowel, a:ANUSVARA .. VISARGA
+       (concat
+        ;; C(HJC)*v*H?a?, or
+        "[\u0D9A-\u0DC6]\\(?:\u0DCA\u200D[\u0D9A-\u0DC6]\\)*[\u0DCF-\u0DDF\u0DF2-\u0DF3]*\u0DCA?[\u0D82-\u0D83]?\\|"
+        ;; Va?, or
+        "[\u0D85-\u0D96][\u0D82-\u0D83]?\\|"
+        ;; any other singleton characters
+        "[\u0D80-\u0DFF]")
+       0 'font-shape-gstring)))
 
-;; arch-tag: 87b9ad3b-5090-422f-b942-eb85b9d52e7c
 ;; sinhala.el ends here