changeset 90280:f596623ad9fd

(ethio-fidel-to-tex-buffer) (ethio-tex-to-fidel-buffer, ethio-composition-function) ("ethiopic-tex"): Support new characters in Unicode 4.1.
author Kenichi Handa <handa@m17n.org>
date Fri, 20 Jan 2006 07:36:01 +0000 (2006-01-20)
parents ede12d80b3a5
children d3b6ae880dce
files lisp/language/ethio-util.el
diffstat 1 files changed, 65 insertions(+), 5 deletions(-) [+]
line wrap: on
line diff
--- a/lisp/language/ethio-util.el	Fri Jan 20 07:31:04 2006 +0000
+++ b/lisp/language/ethio-util.el	Fri Jan 20 07:36:01 2006 +0000
@@ -5,9 +5,9 @@
 ;; Copyright (C) 1997, 1998, 1999, 2001, 2004, 2005
 ;;   National Institute of Advanced Industrial Science and Technology (AIST)
 ;;   Registration Number H14PRO021
-;; Copyright (C) 2005
+;; Copyright (C) 2005, 2006
 ;;   National Institute of Advanced Industrial Science and Technology (AIST)
-;;   Registration Number: H15PRO 110
+;;   Registration Number: H15PRO110
 
 ;; Keywords: mule, multilingual, Ethiopic
 
@@ -796,7 +796,7 @@
     ;; Special treatment for geminated characters.
     ;; Geminated characters la", etc. change into \geminateG{\laG}, etc.
     (goto-char (point-min))
-    (while (search-forward "���" nil t)
+    (while (re-search-forward "��\\|���" nil t)
       (setq comp (find-composition (match-beginning 0)))
       (if (null comp)
 	  (replace-match "\\\\geminateG{}" t)
@@ -845,7 +845,7 @@
     ;; compose geminated characters
     (goto-char (point-min))
     (while (re-search-forward "\\\\geminateG{\\(\\ce?\\)}" nil t)
-      (replace-match "\\1���"))
+      (replace-match "\\1��"))
 
     ;; remove redundant braces, if any
     (goto-char (point-min))
@@ -1021,7 +1021,7 @@
 ;;;###autoload
 (defun ethio-composition-function (pos &optional string)
   (setq pos (1- pos))
-  (let ((pattern "\\ce���"))
+  (let ((pattern "\\ce\\(��\\|���\\)"))
     (if string
 	(if (and (>= pos 0)
 		 (eq (string-match pattern string pos) pos))
@@ -2008,6 +2008,66 @@
  ("\\lquoteG" ?���) ("\\lquoteG" "束")
  ("\\rquoteG" ?���) ("\\rquoteG" "損")
  ("\\qmarkG" ?���) ("\\qmarkG" "?")
+
+ ;;
+ ;; New characters in Unicode 4.1.
+ ;;
+ ;; In forward conversion, these characters override the old private
+ ;; extensions above.  The old private extensions still keep their
+ ;; reverse conversion.
+ ;;
+
+ ("\\ornamentG" ?��)
+ ("\\yWaG" ?��)
+ ("\\GWaG" ?��)
+ ("\\MWeG" ?��)
+ ("\\mWiG" ?��)
+ ("\\mWEG" ?��)
+ ("\\mWG" ?��)
+ ("\\bWeG" ?��)
+ ("\\bWiG" ?��)
+ ("\\bWEG" ?��)
+ ("\\bWG" ?��)
+ ("\\fWeG" ?��)
+ ("\\fWiG" ?��)
+ ("\\fWEG" ?��)
+ ("\\fWG" ?��)
+ ("\\pWeG" ?��)
+ ("\\pWiG" ?��)
+ ("\\pWEG" ?��)
+ ("\\pWG" ?��)
+ ("\\GWeG" ?盒�)
+ ("\\GWiG" ?盒�)
+ ("\\GWEG" ?盒�)
+ ("\\GWG" ?盒�)
+ ("\\qqeG" ?盞�)
+ ("\\qquG" ?盞�)
+ ("\\qqiG" ?盞�)
+ ("\\qqaG" ?盞�)
+ ("\\qqEG" ?盞�)
+ ("\\qqG" ?盞�)
+ ("\\qqoG" ?盞�)
+ ("\\kkeG" ?盞�)
+ ("\\kkuG" ?盞�)
+ ("\\kkiG" ?盞�)
+ ("\\kkaG" ?盞�)
+ ("\\kkEG" ?盞�)
+ ("\\kkG" ?盞�)
+ ("\\kkoG" ?盞�)
+ ("\\XeG" ?盞�)
+ ("\\XuG" ?盞�)
+ ("\\XiG" ?盞�)
+ ("\\XaG" ?盞�)
+ ("\\XEG" ?盞�)
+ ("\\XG" ?盞�)
+ ("\\XoG" ?盞�)
+ ("\\ggeG" ?盞�)
+ ("\\gguG" ?盞�)
+ ("\\ggiG" ?盞�)
+ ("\\ggaG" ?盞�)
+ ("\\ggEG" ?盞�)
+ ("\\ggG" ?盞�)
+ ("\\ggoG" ?盞�)
  )
 
 ;; The ethiopic-tex package is not used for keyboard input, therefore