--- Begin Message ---
|
Subject: |
24.2.93; auto-generated latin-ltx mappings make suboptimal glyph choices |
|
Date: |
Wed, 13 Mar 2013 18:37:10 -0400 |
|
User-agent: |
Gnus/5.110018 (No Gnus v0.18) Emacs/24.2.93 (darwin) |
After the change http://bzr.savannah.gnu.org/lh/emacs/emacs-24/revision/107803:
* leim/quail/latin-ltx.el: Auto-generate some of the entries.
(latin-ltx--ascii-p): New function.
(latin-ltx--define-rules): New macro.
(define-rules): Use it.
Certain latin-ltx rules (those for diaeresis etc) are autogenerated
based on a pattern match of character names, this has the unfortunate
side-effect of sometimes making undesirable (at least to me) choices of
glyph.
For example, on this system if I type \"e it prefers CYRILLIC SMALL
LETTER E WITH DIAERESIS (the equivalent is true for A, O, etc.) --
presumably because this is the first character that matches the pattern
specified -- it's rarely the character I want though, and it's
impossible to get completion access to others (or possibly enter them at
all, I'm not familiar enough with quail to say, I've never needed to be
before)
Reverting the above change restores things to defaulting latin, as it
used to. It'd be nice to either get the old behaviour back, to get the
ability to cycle the possibilities, or to have the ability to specify
which alphabet should "win" to resolve conflicts, whichever is more
appropriate.
In GNU Emacs 24.2.93.5 (i386-apple-darwin11.4.2, NS apple-appkit-1138.51)
of 2013-02-25 on quisling.home
Windowing system distributor `Apple', version 10.3.1138
Configured using:
`configure '--with-ns' '--without-pop''
Important settings:
value of $LANG: en_US.UTF-8
locale-coding-system: utf-8-unix
default enable-multibyte-characters: t
Major mode: Lisp Interaction
Minor modes in effect:
tooltip-mode: t
mouse-wheel-mode: t
tool-bar-mode: t
menu-bar-mode: t
file-name-shadow-mode: t
global-font-lock-mode: t
font-lock-mode: t
blink-cursor-mode: t
auto-composition-mode: t
auto-encryption-mode: t
auto-compression-mode: t
line-number-mode: t
transient-mark-mode: t
Recent input:
C-\ t e x <tab> <return> \ " e s-x C-g M-x r e p o
r t - e m <tab> b <backspace> <return>
Recent messages:
For information about GNU Emacs and the GNU system, type C-h C-a.
Loading quail/latin-ltx...done
kill-region: The mark is not set now, so there is no region
Quit
Load-path shadows:
None found.
Features:
(shadow sort gnus-util mail-extr emacsbug message format-spec rfc822 mml
mml-sec mm-decode mm-bodies mm-encode mail-parse rfc2231 mailabbrev
gmm-utils mailheader sendmail rfc2047 rfc2045 ietf-drums mm-util
mail-prsvr mail-utils cus-start cus-load quail help-mode easymenu
time-date tooltip ediff-hook vc-hooks lisp-float-type mwheel ns-win
tool-bar dnd fontset image regexp-opt fringe tabulated-list newcomment
lisp-mode register page menu-bar rfn-eshadow timer select scroll-bar
mouse jit-lock font-lock syntax facemenu font-core frame cham georgian
utf-8-lang misc-lang vietnamese tibetan thai tai-viet lao korean
japanese hebrew greek romanian slovak czech european ethiopic indian
cyrillic chinese case-table epa-hook jka-cmpr-hook help simple abbrev
minibuffer loaddefs button faces cus-face macroexp files text-properties
overlay sha1 md5 base64 format env code-pages mule custom widget
hashtable-print-readable backquote make-network-process ns multi-tty
emacs)
--- End Message ---
--- Begin Message ---
|
Subject: |
Re: bug#13950: 24.2.93; auto-generated latin-ltx mappings make suboptimal glyph choices |
|
Date: |
Wed, 13 Mar 2013 23:02:10 -0400 |
|
User-agent: |
Gnus/5.13 (Gnus v5.13) Emacs/24.3.50 (gnu/linux) |
> After the change
> http://bzr.savannah.gnu.org/lh/emacs/emacs-24/revision/107803:
> * leim/quail/latin-ltx.el: Auto-generate some of the entries.
> (latin-ltx--ascii-p): New function.
> (latin-ltx--define-rules): New macro.
> (define-rules): Use it.
> Certain latin-ltx rules (those for diaeresis etc) are autogenerated
> based on a pattern match of character names, this has the unfortunate
> side-effect of sometimes making undesirable (at least to me) choices of
> glyph.
Indeed, there were some major problems there.
I installed the patch below in the emacs-24 branch, which resolves those
conflicts and also adds a few new rules, while we're at it.
Thanks for pointing out the obvious (too bad that's after the 24.3
release, tho).
Stefan
=== modified file 'leim/quail/latin-ltx.el'
--- leim/quail/latin-ltx.el 2013-01-01 09:11:05 +0000
+++ leim/quail/latin-ltx.el 2013-03-14 02:53:01 +0000
@@ -43,6 +43,26 @@
t t nil nil nil nil nil nil nil t)
(eval-when-compile
+ (require 'cl-lib)
+
+ (defconst latin-ltx--mark-map
+ '(("DOT BELOW" . "d")
+ ("DOT ABOVE" . ".")
+ ("OGONEK" . "k")
+ ("CEDILLA" . "c")
+ ("CARON" . "v")
+ ;; ("HOOK ABOVE" . ??)
+ ("MACRON" . "=")
+ ("BREVE" . "u")
+ ("TILDE" . "~")
+ ("GRAVE" . "`")
+ ("CIRCUMFLEX" . "^")
+ ("DIAERESIS" . "\"")
+ ("DOUBLE ACUTE" . "H")
+ ("ACUTE" . "'")))
+
+ (defconst latin-ltx--mark-re (regexp-opt (mapcar #'car latin-ltx--mark-map)))
+
(defun latin-ltx--ascii-p (char)
(and (characterp char) (< char 128)))
@@ -53,7 +73,8 @@
(pcase rule
(`(,_ ,(pred characterp)) (push rule newrules)) ;; Normal quail rule.
(`(,seq ,re)
- (let ((count 0))
+ (let ((count 0)
+ (re (eval re t)))
(dolist (pair (ucs-names))
(let ((name (car pair))
(char (cdr pair)))
@@ -68,9 +89,27 @@
(push (list x char) newrules))
(setq count (1+ count))
(push (list keys char) newrules))))))
- ;(message "latin-ltx: %d mapping for %S" count re)
+ ;; (message "latin-ltx: %d mappings for %S" count re)
))))
- `(quail-define-rules ,@(nreverse (delete-dups newrules))))))
+ (setq newrules (delete-dups newrules))
+ (let ((rules (copy-sequence newrules)))
+ (while rules
+ (let ((rule (pop rules)))
+ (when (assoc (car rule) rules)
+ (let ((conflicts (list (cadr rule)))
+ (tail rules)
+ c)
+ (while (setq c (assoc (car rule) tail))
+ (push (cadr c) conflicts)
+ (setq tail (cdr (memq c tail)))
+ (setq rules (delq c rules)))
+ (message "Conflict for %S: %S"
+ (car rule) (apply #'string conflicts)))))))
+ (let ((inputs (mapcar #'car newrules)))
+ (setq inputs (delete-dups inputs))
+ (message "latin-ltx: %d rules (+ %d conflicts)!"
+ (length inputs) (- (length newrules) (length inputs))))
+ `(quail-define-rules ,@(nreverse newrules)))))
(latin-ltx--define-rules
("!`" ?¡)
@@ -89,69 +128,35 @@
("$^o$" ?º)
("?`" ?¿)
- ("\\`" ?̀)
- ("\\`{}" ?`)
- ((lambda (name char)
- (let ((c (if (match-end 1)
- (downcase (match-string 2 name))
- (match-string 2 name))))
- (list (format "\\`{%s}" c) (format "\\`%s" c))))
- "\\(?:CAPITAL\\|SMAL\\(L\\)\\) LETTER \\(.\\) WITH GRAVE")
-
- ("\\'" ?́)
- ("\\'{}" ?´)
- ((lambda (name char)
- (let ((c (if (match-end 1)
- (downcase (match-string 2 name))
- (match-string 2 name))))
- (list (format "\\'{%s}" c) (format "\\'%s" c))))
- "\\(?:CAPITAL\\|SMAL\\(L\\)\\) LETTER \\(.\\) WITH ACUTE")
-
- ("\\^" ?̂)
- ("\\^{}" ?^)
- ((lambda (name char)
- (let ((c (if (match-end 1)
- (downcase (match-string 2 name))
- (match-string 2 name))))
- (list (format "\\^{%s}" c) (format "\\^%s" c))))
- "\\(?:CAPITAL\\|SMAL\\(L\\)\\) LETTER \\(.\\) WITH CIRCUMFLEX")
-
- ("\\~" ?̃)
- ("\\~{}" ?˜)
- ((lambda (name char)
- (let ((c (if (match-end 1)
- (downcase (match-string 2 name))
- (match-string 2 name))))
- (list (format "\\~{%s}" c) (format "\\~%s" c))))
- "\\(?:CAPITAL\\|SMAL\\(L\\)\\) LETTER \\(.\\) WITH TILDE")
-
- ("\\\"" ?̈)
- ("\\\"{}" ?¨)
- ((lambda (name char)
- (let ((c (if (match-end 1)
- (downcase (match-string 2 name))
- (match-string 2 name))))
- (list (format "\\\"{%s}" c) (format "\\\"%s" c))))
- "\\(?:CAPITAL\\|SMAL\\(L\\)\\) LETTER \\(.\\) WITH DIAERESIS")
-
- ("\\k" ?̨)
- ("\\k{}" ?˛)
((lambda (name char)
- (let ((c (if (match-end 1)
+ (let* ((c (if (match-end 1)
(downcase (match-string 2 name))
- (match-string 2 name))))
- (list (format "\\k{%s}" c) ;; (format "\\k%s" c)
- )))
- "\\(?:CAPITAL\\|SMAL\\(L\\)\\) LETTER \\(.\\) WITH OGONEK")
+ (match-string 2 name)))
+ (mark1 (cdr (assoc (match-string 3 name) latin-ltx--mark-map)))
+ (mark2 (if (match-end 4)
+ (cdr (assoc (match-string 4 name) latin-ltx--mark-map))))
+ (marks (if mark2 (concat mark1 "\\" mark2) mark1)))
+ (cl-assert mark1)
+ (cons (format "\\%s{%s}" marks c)
+ ;; Exclude "d" because we use "\\dh" for something else.
+ (unless (member (or mark2 mark1) '("d"));; "k"
+ (list (format "\\%s%s" marks c))))))
+ (concat "\\`LATIN \\(?:CAPITAL\\|SMAL\\(L\\)\\) LETTER \\(.\\) WITH \\("
+ latin-ltx--mark-re "\\)\\(?: AND \\("
+ latin-ltx--mark-re "\\)\\)?\\'"))
+
+ ((lambda (name char)
+ (let* ((mark (cdr (assoc (match-string 1 name) latin-ltx--mark-map))))
+ (cl-assert mark)
+ (list (format "\\%s" mark))))
+ (concat "\\`COMBINING \\(" latin-ltx--mark-re "\\)\\(?: ACCENT\\)?\\'"))
- ("\\c" ?̧)
- ("\\c{}" ?¸)
((lambda (name char)
- (let ((c (if (match-end 1)
- (downcase (match-string 2 name))
- (match-string 2 name))))
- (list (format "\\c{%s}" c) (format "\\c%s" c))))
- "\\(?:CAPITAL\\|SMAL\\(L\\)\\) LETTER \\(.\\) WITH CEDILLA")
+ (unless (latin-ltx--ascii-p char)
+ (let* ((mark (cdr (assoc (match-string 1 name) latin-ltx--mark-map))))
+ (cl-assert mark)
+ (list (format "\\%s{}" mark)))))
+ (concat "\\`\\(?:SPACING \\)?\\(" latin-ltx--mark-re "\\)\\(?:
ACCENT\\)?\\'"))
("\\AA" ?Å) ;; ("{\\AA}" ?Å)
("\\AE" ?Æ) ;; ("{\\AE}" ?Æ)
@@ -166,42 +171,6 @@
("$\\div$" ?÷) ("\\div" ?÷)
("\\o" ?ø) ;; ("{\\o}" ?ø)
- ("\\=" ?̄)
- ("\\={}" ?¯)
- ((lambda (name char)
- (let ((c (if (match-end 1)
- (downcase (match-string 2 name))
- (match-string 2 name))))
- (list (format "\\={%s}" c) (format "\\=%s" c))))
- "\\(?:CAPITAL\\|SMAL\\(L\\)\\) LETTER \\(.\\) WITH MACRON")
-
- ("\\u" ?̆)
- ("\\u{}" ?˘)
- ((lambda (name char)
- (let ((c (if (match-end 1)
- (downcase (match-string 2 name))
- (match-string 2 name))))
- (list (format "\\u{%s}" c) (format "\\u%s" c))))
- "\\(?:CAPITAL\\|SMAL\\(L\\)\\) LETTER \\(.\\) WITH BREVE")
-
- ("\\." ?̇)
- ("\\.{}" ?˙)
- ((lambda (name char)
- (let ((c (if (match-end 1)
- (downcase (match-string 2 name))
- (match-string 2 name))))
- (list (format "\\.{%s}" c) (format "\\.%s" c))))
- "\\(?:CAPITAL\\|SMAL\\(L\\)\\) LETTER \\(.\\) WITH DOT ABOVE")
-
- ("\\v" ?̌)
- ("\\v{}" ?ˇ)
- ((lambda (name char)
- (let ((c (if (match-end 1)
- (downcase (match-string 2 name))
- (match-string 2 name))))
- (list (format "\\v{%s}" c) (format "\\v%s" c))))
- "\\(?:CAPITAL\\|SMAL\\(L\\)\\) LETTER \\(.\\) WITH CARON")
-
("\\~{\\i}" ?ĩ)
("\\={\\i}" ?ī)
("\\u{\\i}" ?ĭ)
@@ -214,12 +183,6 @@
("\\H" ?̋)
("\\H{}" ?˝)
- ((lambda (name char)
- (let ((c (if (match-end 1)
- (downcase (match-string 2 name))
- (match-string 2 name))))
- (list (format "\\H{%s}" c) (format "\\H%s" c))))
- "\\(?:CAPITAL\\|SMAL\\(L\\)\\) LETTER \\(.\\) WITH DOUBLE ACUTE")
("\\U{o}" ?ő) ("\\Uo" ?ő) ;; FIXME: Was it just a typo?
("\\OE" ?Œ) ;; ("{\\OE}" ?Œ)
@@ -248,15 +211,11 @@
(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))))
- "MODIFIER LETTER \\(SMALL\\|CAPITAL\\) \\(.*\\)")
+ ((lambda (name _char)
+ (let* ((basename (match-string 2 name))
+ (name (if (match-end 1) (capitalize basename) (downcase basename))))
+ (concat "^" (if (> (length name) 1) "\\") name)))
+ "\\`MODIFIER LETTER \\(?:SMALL\\|CAPITA\\(L\\)\\) \\([[:ascii:]]+\\)\\'")
;; ((lambda (name char) (format "^%s" (downcase (match-string 1 name))))
;; "\\`MODIFIER LETTER SMALL \\(.\\)\\'")
@@ -268,22 +227,14 @@
("\\b" ?̱)
- ("\\d" ?̣)
- ;; ("\\d{}" ?) ;; FIXME: can't find the DOT BELOW character.
- ((lambda (name char)
- (let ((c (if (match-end 1)
- (downcase (match-string 2 name))
- (match-string 2 name))))
- (list (format "\\d{%s}" c) ;; (format "\\d%s" c)
- )))
- "\\(?:CAPITAL\\|SMAL\\(L\\)\\) LETTER \\(.\\) WITH DOT BELOW")
-
("\\rq" ?’)
;; FIXME: Provides some useful entries (yen, euro, copyright, registered,
;; currency, minus, micro), but also a lot of dubious ones.
((lambda (name char)
- (unless (latin-ltx--ascii-p char)
+ (unless (or (latin-ltx--ascii-p char)
+ ;; We prefer COMBINING LONG SOLIDUS OVERLAY for \not.
+ (member name '("NOT SIGN")))
(concat "\\" (downcase (match-string 1 name)))))
"\\`\\([^- ]+\\) SIGN\\'")
@@ -373,7 +324,6 @@
("\\circledcirc" ?⊚)
("\\circleddash" ?⊝)
("\\clubsuit" ?♣)
- ("\\colon" ?:) ;FIXME: Conflict with "COLON SIGN" ₡.
("\\coloneq" ?≔)
("\\complement" ?∁)
("\\cong" ?≅)
@@ -396,7 +346,6 @@
("\\ddots" ?⋱)
("\\diamond" ?⋄)
("\\diamondsuit" ?♢)
- ("\\digamma" ?Ϝ)
("\\divideontimes" ?⋇)
("\\doteq" ?≐)
("\\doteqdot" ?≑)
--- End Message ---