[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Emacs-diffs] master 1145322 2/2: Fix rules for \phi and \varphi which w
From: |
Tassilo Horn |
Subject: |
[Emacs-diffs] master 1145322 2/2: Fix rules for \phi and \varphi which were reversed |
Date: |
Tue, 30 Aug 2016 18:35:15 +0000 (UTC) |
branch: master
commit 1145322a114bb7359fcfdbdce6ccb7d9d44c82ba
Author: Tassilo Horn <address@hidden>
Commit: Tassilo Horn <address@hidden>
Fix rules for \phi and \varphi which were reversed
* lisp/leim/quail/latin-ltx.el: Special-case phi/varphi because those
are reversed in ucs-names. Also remove FIXME stating sigma/varsigma
were reversed which is not true (anymore?).
---
lisp/leim/quail/latin-ltx.el | 18 ++++++++++++++----
1 file changed, 14 insertions(+), 4 deletions(-)
diff --git a/lisp/leim/quail/latin-ltx.el b/lisp/leim/quail/latin-ltx.el
index c265add..fb3d2ba 100644
--- a/lisp/leim/quail/latin-ltx.el
+++ b/lisp/leim/quail/latin-ltx.el
@@ -239,10 +239,15 @@ system, including many technical ones. Examples:
"\\`\\([^- ]+\\) SIGN\\'")
((lambda (name char)
- (concat "\\" (funcall (if (match-end 1) #' capitalize #'downcase)
- (match-string 2 name))))
+ ;; "GREEK SMALL LETTER PHI" (which is \phi) and "GREEK PHI SYMBOL"
+ ;; (which is \varphi) are reversed in `ucs-names', so we define
+ ;; them manually.
+ (unless (string-match-p "\\<PHI\\>" name)
+ (concat "\\" (funcall (if (match-end 1) #' capitalize #'downcase)
+ (match-string 2 name)))))
"\\`GREEK \\(?:SMALL\\|CAPITA\\(L\\)\\) LETTER \\([^- ]+\\)\\'")
+ ("\\phi" ?ϕ)
("\\Box" ?□)
("\\Bumpeq" ?≎)
("\\Cap" ?⋒)
@@ -628,12 +633,17 @@ system, including many technical ones. Examples:
("\\vDash" ?⊨)
((lambda (name char)
- (concat "\\var" (downcase (match-string 1 name))))
+ ;; "GREEK SMALL LETTER PHI" (which is \phi) and "GREEK PHI SYMBOL"
+ ;; (which is \varphi) are reversed in `ucs-names', so we define
+ ;; them manually.
+ (unless (string-match-p "\\<PHI\\>" name)
+ (concat "\\var" (downcase (match-string 1 name)))))
"\\`GREEK \\([^- ]+\\) SYMBOL\\'")
+ ("\\varphi" ?φ)
("\\varprime" ?′)
("\\varpropto" ?∝)
- ("\\varsigma" ?ς) ;FIXME: Looks reversed with the non\var.
+ ("\\varsigma" ?ς)
("\\vartriangleleft" ?⊲)
("\\vartriangleright" ?⊳)
("\\vdash" ?⊢)