mirrors/emacs
1
Fork 0
mirror of git://git.sv.gnu.org/emacs.git synced 2026-02-09 09:16:02 -08:00
Code Issues Projects Releases Wiki Activity

Further fixes for emojis in the "people" categories

Browse source 
* lisp/international/emoji.el (emoji--base-name): Get more derived
categories right.
This commit is contained in:
Lars Ingebrigtsen 2021-12-19 19:53:04 +01:00
parent 434c2cb2e9
commit df3fde6fa5
1 changed files with 20 additions and 12 deletions
Download patch file Download diff file Expand all files Collapse all files

32
lisp/international/emoji.el
View file

@ -412,18 +412,26 @@ the name is not known."
(write-region (point-min) (point-max) file)))
(defun emoji--base-name (name derivations)
(let* ((base (replace-regexp-in-string ":.*" "" name))
(non-binary (replace-regexp-in-string "\\`\\(man\\|woman\\) " ""
base)))
;; If we have (for instance) "person golfing", and we're adding
;; "man golfing", make the latter a derivation of the former.
(cond
((gethash (concat "person " non-binary) derivations)
(concat "person " non-binary))
((gethash non-binary derivations)
non-binary)
(t
base))))
(let* ((base (replace-regexp-in-string ":.*" "" name)))
(catch 'found
;; If we have (for instance) "person golfing", and we're adding
;; "man golfing", make the latter a derivation of the former.
(let ((non-binary (replace-regexp-in-string
"\\`\\(m[ae]n\\|wom[ae]n\\) " "" base)))
(dolist (prefix '("person " "people " ""))
(let ((key (concat prefix non-binary)))
(when (gethash key derivations)
(throw 'found key)))))
;; We can also have the gender at the end of the string, like
;; "merman" and "pregnant woman".
(let ((non-binary (replace-regexp-in-string
"\\(m[ae]n\\|wom[ae]n\\|maid\\)\\'" "" base)))
(dolist (suffix '(" person" "person" ""))
(let ((key (concat non-binary suffix)))
(when (gethash key derivations)
(throw 'found key)))))
;; Just return the base.
base)))
(defun emoji--split-subgroup (subgroup)
(let ((prefixes '("face" "hand" "person" "animal" "plant"