From: Robert Pluim <rpluim@gmail.com>
To: Eli Zaretskii <eliz@gnu.org>
Cc: 63731@debbugs.gnu.org, steven@stebalien.com
Subject: bug#63731: [PATCH] Support Emoji Variation Sequence 16 (FE0F) where appropriate
Date: Sun, 28 May 2023 13:57:49 +0200 [thread overview]
Message-ID: <87h6rw8y82.fsf@gmail.com> (raw)
In-Reply-To: <83jzwvj94x.fsf@gnu.org> (Eli Zaretskii's message of "Fri, 26 May 2023 20:27:26 +0300")
>>>>> On Fri, 26 May 2023 20:27:26 +0300, Eli Zaretskii <eliz@gnu.org> said:
>>
>> Itʼs a change to the VS-16 entry. We did discuss it before, and
>> decided to put it aside because the solutions all involved adding
>> composition-function-table entries for 0-9 or similar. I donʼt
>> remember why we didnʼt consider adding to VS-16ʼs entry.
>>
>> Iʼll do some more testing, and post a final version hopefully this
>> weekend sometime.
Eli> OK, thanks.
Eli, if the 20e3 changes are too much for emacs-29, I can put them in
master.
Iʼll put some notes in admin/notes/unicode as well.
diff --git c/admin/unidata/emoji-zwj.awk i/admin/unidata/emoji-zwj.awk
index 7d2ff6cb900..0b6f1267205 100644
--- c/admin/unidata/emoji-zwj.awk
+++ i/admin/unidata/emoji-zwj.awk
@@ -82,6 +82,7 @@ END {
trigger_codepoints[11] = "1F574"
trigger_codepoints[12] = "1F575"
trigger_codepoints[13] = "1F590"
+ trigger_codepoints[14] = "20E3"
printf "(setq auto-composition-emoji-eligible-codepoints\n"
printf "'("
diff --git c/lisp/composite.el i/lisp/composite.el
index fb8b76114f4..acba4e73c17 100644
--- c/lisp/composite.el
+++ i/lisp/composite.el
@@ -762,6 +762,23 @@ compose-gstring-for-dotted-circle
(if (memq val '(Mn Mc Me))
(set-char-table-range composition-function-table key elt)))
unicode-category-table))
+ ;; for Emoji presentation selector
+ ;; We don't want the generic nil 0 entry because it causes display
+ ;; of an extra box for FE0F. (Bug#63731)
+ ;; This also covers the fully-qualified enclosing keycap case.
+ (set-char-table-range
+ composition-function-table
+ #xFE0E
+ `([,(purecopy "\\c.\ufe0e") 1 compose-gstring-for-graphic]))
+ (set-char-table-range
+ composition-function-table
+ #xFE0F
+ `([,(purecopy "\\c.\ufe0f\u20e3?") 1 compose-gstring-for-graphic]))
+ ;; for unqualified enclosing keycap
+ (set-char-table-range
+ composition-function-table
+ #x20E3
+ `([,(purecopy "[#*0-9]\u20e3") 1 compose-gstring-for-graphic]))
;; for dotted-circle
(aset composition-function-table #x25CC
`([,(purecopy ".\\c^") 0 compose-gstring-for-dotted-circle]))
@@ -857,11 +874,10 @@ compose-gstring-for-variation-glyph
;; taken care of by font_range in font.c, which will check for an
;; emoji font for codepoints used in compositions even if they're not
;; emoji themselves, and thus choose the Emoji presentation for them
-;; when followed by VS-16. VS-15 *is* handled here, because if it's
-;; handled in font_range, we end up choosing the Emoji presentation
-;; rather than the Text presentation.
+;; when followed by VS-16. VS-15 is handled by the setup around
+;; unicode-category-table above.
(let ((elt '([".." 1 compose-gstring-for-variation-glyph])))
- (set-char-table-range composition-function-table '(#xFE00 . #xFE0E) elt)
+ (set-char-table-range composition-function-table '(#xFE00 . #xFE0D) elt)
(set-char-table-range composition-function-table '(#xE0100 . #xE01EF) elt))
(defun auto-compose-chars (func from to font-object string direction)
Robert
--
next prev parent reply other threads:[~2023-05-28 11:57 UTC|newest]
Thread overview: 61+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-05-26 3:18 bug#63731: [PATCH] Support Emoji Variation Sequence 16 (FE0F) where appropriate Steven Allen
2023-05-26 6:41 ` Eli Zaretskii
2023-05-26 8:34 ` Robert Pluim
2023-05-26 8:46 ` Eli Zaretskii
2023-05-26 11:14 ` Robert Pluim
2023-05-26 12:06 ` Eli Zaretskii
2023-05-26 14:02 ` Robert Pluim
2023-05-26 14:55 ` Eli Zaretskii
2023-05-26 15:25 ` Robert Pluim
2023-05-26 15:52 ` Eli Zaretskii
2023-05-26 16:24 ` Robert Pluim
2023-05-26 17:27 ` Eli Zaretskii
2023-05-26 17:35 ` Robert Pluim
2023-05-26 18:05 ` Eli Zaretskii
2023-05-28 11:43 ` Robert Pluim
2023-05-28 12:44 ` Eli Zaretskii
2023-05-26 17:43 ` Eli Zaretskii
2023-05-28 10:29 ` Robert Pluim
2023-05-28 12:37 ` Eli Zaretskii
2023-05-28 11:57 ` Robert Pluim [this message]
2023-05-28 12:47 ` Eli Zaretskii
2023-05-29 10:44 ` Robert Pluim
2023-05-29 13:58 ` Eli Zaretskii
2023-05-29 14:43 ` Robert Pluim
2023-05-29 14:55 ` Eli Zaretskii
2023-05-29 16:13 ` Robert Pluim
2023-05-29 17:18 ` Eli Zaretskii
2023-05-30 7:25 ` Robert Pluim
2023-05-30 12:10 ` Eli Zaretskii
2023-05-30 13:30 ` Robert Pluim
2023-05-30 16:32 ` Eli Zaretskii
2023-05-31 16:11 ` Robert Pluim
2023-05-31 16:18 ` Eli Zaretskii
2023-06-01 12:43 ` Eli Zaretskii
2023-06-01 13:30 ` Robert Pluim
2023-06-01 16:10 ` Eli Zaretskii
2023-06-01 16:34 ` Robert Pluim
2023-06-02 8:15 ` Robert Pluim
2023-06-02 12:06 ` Eli Zaretskii
2023-06-02 12:25 ` Robert Pluim
2023-06-02 12:58 ` Eli Zaretskii
2023-06-02 13:58 ` Robert Pluim
2023-06-03 5:36 ` Eli Zaretskii
2023-06-05 13:08 ` Robert Pluim
2023-06-05 13:12 ` Eli Zaretskii
2023-06-05 13:31 ` Eli Zaretskii
2023-06-05 14:06 ` Robert Pluim
2023-06-05 13:36 ` Robert Pluim
2023-06-05 13:47 ` Eli Zaretskii
2023-06-05 14:27 ` Robert Pluim
2023-06-05 15:35 ` Eli Zaretskii
2023-06-05 15:57 ` Robert Pluim
2023-06-05 16:20 ` Robert Pluim
2023-06-05 16:41 ` Eli Zaretskii
2023-06-06 7:24 ` Robert Pluim
2023-06-05 16:39 ` Eli Zaretskii
2023-06-06 7:28 ` Robert Pluim
2023-06-06 11:53 ` Eli Zaretskii
2023-05-26 15:06 ` Steven Allen
2023-05-26 15:29 ` Robert Pluim
2023-05-26 16:03 ` Steven Allen
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
List information: https://www.gnu.org/software/emacs/
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=87h6rw8y82.fsf@gmail.com \
--to=rpluim@gmail.com \
--cc=63731@debbugs.gnu.org \
--cc=eliz@gnu.org \
--cc=steven@stebalien.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
Code repositories for project(s) associated with this public inbox
https://git.savannah.gnu.org/cgit/emacs.git
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).