* mh-e.texi (VERSION, EDITION, UPDATED, UPDATE-MONTH): Update for

[gnu-emacs] / leim / quail / latin-ltx.el

diff --git a/leim/quail/latin-ltx.el b/leim/quail/latin-ltx.el
index 9f4c9664899abba4082351a9a2ab09c2be42865e..2179e6264a25441ebbd3037b4592cf6929d5aacb 100644 (file)
--- a/leim/quail/latin-ltx.el
+++ b/leim/quail/latin-ltx.el
@@ -1,6 +1,6 @@
 ;;; latin-ltx.el --- Quail package for TeX-style input -*-coding: utf-8;-*-
 
-;; Copyright (C) 2001-2012  Free Software Foundation, Inc.
+;; Copyright (C) 2001-2013 Free Software Foundation, Inc.
 ;; Copyright (C) 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009,
 ;;   2010, 2011
 ;;   National Institute of Advanced Industrial Science and Technology (AIST)
@@ -248,14 +248,18 @@ system, including many technical ones.  Examples:
         (string (if (match-end 2) ?^ ?_) basechar))))
   "\\(.*\\)SU\\(?:B\\|\\(PER\\)\\)SCRIPT \\(.*\\)")
 
- ("^\\gamma" ?ˠ)
-
  ((lambda (name char)
-    (let* ((base (format "LATIN %s LETTER %s"
-                         (match-string 1 name) (match-string 2 name)))
-           (basechar (cdr (assoc base (ucs-names)))))
-      (when (latin-ltx--ascii-p basechar)
-        (string ?^ basechar))))
+    (let* ((basename (match-string 2 name))
+           (lbase (format "LATIN %s LETTER %s"
+                          (match-string 1 name) basename))
+           (gbase (format "GREEK %s LETTER %s"
+                          (match-string 1 name) basename))
+           tmp)
+      (cond
+       ((assoc gbase (ucs-names)) (concat "^\\" (downcase basename)))
+       ((latin-ltx--ascii-p (setq tmp (cdr (assoc lbase (ucs-names)))))
+        (string ?^ tmp))
+       (t (message "Unknown modifier letter %s" basename)))))
   "MODIFIER LETTER \\(SMALL\\|CAPITAL\\) \\(.*\\)")
  
  ;; ((lambda (name char) (format "^%s" (downcase (match-string 1 name))))
@@ -463,7 +467,7 @@ system, including many technical ones.  Examples:
  ("\\infty" ?∞)
  ("\\int" ?∫)
  ("\\intercal" ?⊺)
- ("\\langle" ?â\8c©)
+ ("\\langle" ?â\9f¨) ;; Was ?â\8c©, see bug#12948.
  ("\\lbrace" ?{)
  ("\\lbrack" ?\[)
  ("\\lceil" ?⌈)
@@ -475,7 +479,7 @@ system, including many technical ones.  Examples:
  ("\\leftharpoondown" ?↽)
  ("\\leftharpoonup" ?↼)
  ("\\leftleftarrows" ?⇇)
- ("\\leftparengtr" ?〈)
+ ;; ("\\leftparengtr" ?〈), see bug#12948.
  ("\\leftrightarrow" ?↔)
  ("\\leftrightarrows" ?⇆)
  ("\\leftrightharpoons" ?⇋)
@@ -593,7 +597,7 @@ system, including many technical ones.  Examples:
  ("\\propto" ?∝)
  ("\\qed" ?∎)
  ("\\quad" ? )
- ("\\rangle" ?â\8cª)
+ ("\\rangle" ?â\9f©) ;; Was ?â\8cª, see bug#12948.
  ("\\rbrace" ?})
  ("\\rbrack" ?\])
  ("\\rceil" ?⌉)
@@ -604,7 +608,7 @@ system, including many technical ones.  Examples:
  ("\\rightharpoonup" ?⇀)
  ("\\rightleftarrows" ?⇄)
  ("\\rightleftharpoons" ?⇌)
- ("\\rightparengtr" ?〉)
+ ;; ("\\rightparengtr" ?⦔) ;; Was ?〉, see bug#12948.
  ("\\rightrightarrows" ?⇉)
  ("\\rightthreetimes" ?⋌)
  ("\\risingdotseq" ?≓)