from trunk

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 725377aba958f0dc327cfa97a9fd833b6090294b..1b9871d8291cb6c3678b3a31c947c9b0e51a79ea 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,16 @@
+2010-03-01  Kenichi Handa  <handa@m17n.org>
+
+       * language/burmese.el (burmese-composable-pattern): Renamed from
+       myanmar-composable-pattern.
+
+       * international/characters.el (script-list): Change myanmar to
+       burmese.
+
+       * international/fontset.el (script-representative-chars): Change
+       myanmar to burmese.
+       (otf-script-alist): Likewise.
+       (setup-default-fontset): Likewise.  Re-fix :otf spec.
+
 2010-03-01  Alan Mackenzie  <bug-cc-mode@gnu.org>
 
        * cc-engine.el (c-remove-stale-state-cache): Take account of when

diff --git a/lisp/international/characters.el b/lisp/international/characters.el
index fb7c573ceacb48bbf8b2b510b684309fccf8fecd..cf43bb1e6cad7b34ae74a02d3d181225d4543e73 100644 (file)
--- a/lisp/international/characters.el
+++ b/lisp/international/characters.el
@@ -1124,7 +1124,7 @@ Setup char-width-table appropriate for non-CJK language environment."
         (#x0E00 #x0E5F thai)
         (#x0E80 #x0EDF lao)
         (#x0F00 #x0FFF tibetan)
-        (#x1000 #x109F myanmar)
+        (#x1000 #x109F burmese)
         (#x10A0 #x10FF georgian)
         (#x1100 #x11FF hangul)
         (#x1200 #x139F ethiopic)
@@ -1151,7 +1151,7 @@ Setup char-width-table appropriate for non-CJK language environment."
         (#x3400 #x9FAF han)
         (#xA000 #xA4CF yi)
         (#xAA00 #xAA5F cham)
-        (#xAA60 #xAA7B myanmar)
+        (#xAA60 #xAA7B burmese)
         (#xAA80 #xAADF tai-viet)
         (#xAC00 #xD7AF hangul)
         (#xF900 #xFAFF han)

diff --git a/lisp/international/fontset.el b/lisp/international/fontset.el
index 609e018aa7e6e0a553a5f4fcebfb1f6473208673..ecb2088de89fc17d4fa19dc3d189d1f0fc1db71b 100644 (file)
--- a/lisp/international/fontset.el
+++ b/lisp/international/fontset.el
@@ -169,7 +169,7 @@
        (thai #xE17)
        (lao #xEA5)
        (tibetan #xF40)
-       (myanmar #x1000)
+       (burmese #x1000)
        (georgian #x10D3)
        (ethiopic #x1208)
        (cherokee #x13B6)
@@ -260,7 +260,7 @@
        (math . mathematical)
        (mong . mongolian)
        (musc . musical-symbol)
-       (mymr . myanmar)
+       (mymr . burmese)
        (nko\  . nko)
        (ogam . ogham)
        (ital . old_italic)
@@ -415,8 +415,8 @@
      (sinhala ,(font-spec :registry "iso10646-1" :otf '(sinh nil (akhn))))
      (malayalam ,(font-spec :registry "iso10646-1" :otf '(mlym nil (akhn))))
 
-     (myanmar ,(font-spec :registry "iso10646-1" :otf '(mymr brm (liga mark)))
-             ,(font-spec :registry "iso10646-1" :script 'myanmar))
+     (burmese ,(font-spec :registry "iso10646-1" :otf '(mymr nil nil))
+             ,(font-spec :registry "iso10646-1" :script 'burmese))
 
      (lao ,(font-spec :registry "iso10646-1" :otf '(lao\  nil nil (mark)))
          ,(font-spec :registry "iso10646-1" :script 'lao)

diff --git a/lisp/language/burmese.el b/lisp/language/burmese.el
index 554cd7a482c10b9b3fb3c679db6d71043b5b4d51..a53320b5430901488e78dcbf4eb873a4ed1a5b7a 100644 (file)
--- a/lisp/language/burmese.el
+++ b/lisp/language/burmese.el
@@ -36,7 +36,7 @@
             (sample-text . "Burmese (မ္ရန္‌မာ) မင္‍ဂလာပာ")
             (documentation . t)))
 
-(defvar myanmar-composable-pattern
+(defvar burmese-composable-pattern
   (let ((table
         '(("K" . "[\u1004\u105A]\u103A\u1039") ; KINZI sequence
           ("C" . "[\u1000-\u102A\u103F\u1041-\u1049\u104E\u105A-\u105D\u1061\u1065-\u1066\u106E\u1071\u1075\u1081\u108E\uAA60-\uAA6F\uAA71-\uAA76]") ; consonant and vowel letter
@@ -52,7 +52,7 @@
                                               regexp t t))))
     regexp))
 
-(let ((elt (list (vector myanmar-composable-pattern 0 'font-shape-gstring)
+(let ((elt (list (vector burmese-composable-pattern 0 'font-shape-gstring)
                 (vector "." 0 'font-shape-gstring))))
   (set-char-table-range composition-function-table '(#x1000 . #x107F) elt)
   (set-char-table-range composition-function-table '(#xAA60 . #xAA7B) elt))