From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.io!.POSTED.blaine.gmane.org!not-for-mail From: Robert Pluim Newsgroups: gmane.emacs.bugs Subject: bug#63731: [PATCH] Support Emoji Variation Sequence 16 (FE0F) where appropriate Date: Fri, 02 Jun 2023 10:15:08 +0200 Message-ID: <87o7ly9t6b.fsf@gmail.com> References: <87a5xrzsph.fsf@stebalien.com> <87wn0vkqn1.fsf@gmail.com> <83jzwvj94x.fsf@gnu.org> <87h6rw8y82.fsf@gmail.com> <83353gipww.fsf@gnu.org> <87edmzto0l.fsf@gmail.com> <83ilcbgrxo.fsf@gnu.org> <87zg5nb3m3.fsf@gmail.com> <83bki3gpai.fsf@gnu.org> <87sfbfazfp.fsf@gmail.com> <837csrgioe.fsf@gnu.org> <87jzwqb7r3.fsf@gmail.com> <83ttvuf29m.fsf@gnu.org> <87a5xmaqul.fsf@gmail.com> <83r0qxg4q0.fsf@gnu.org> <875y88bhvr.fsf@gmail.com> <83ilc8eapd.fsf@gnu.org> <83edmvcpzl.fsf@gnu.org> <87wn0n9uol.fsf@gmail.com> <83a5xjcgev.fsf@gnu.org> <87sfbb9m4y.fsf@gmail.com> Mime-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: quoted-printable Injection-Info: ciao.gmane.io; posting-host="blaine.gmane.org:116.202.254.214"; logging-data="35589"; mail-complaints-to="usenet@ciao.gmane.io" Cc: 63731@debbugs.gnu.org, steven@stebalien.com To: Eli Zaretskii Original-X-From: bug-gnu-emacs-bounces+geb-bug-gnu-emacs=m.gmane-mx.org@gnu.org Fri Jun 02 10:16:16 2023 Return-path: Envelope-to: geb-bug-gnu-emacs@m.gmane-mx.org Original-Received: from lists.gnu.org ([209.51.188.17]) by ciao.gmane.io with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.92) (envelope-from ) id 1q4zxI-00097n-Hr for geb-bug-gnu-emacs@m.gmane-mx.org; Fri, 02 Jun 2023 10:16:16 +0200 Original-Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1q4zx5-0001ZR-Vx; Fri, 02 Jun 2023 04:16:04 -0400 Original-Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1q4zx4-0001Yo-5X for bug-gnu-emacs@gnu.org; Fri, 02 Jun 2023 04:16:02 -0400 Original-Received: from debbugs.gnu.org ([209.51.188.43]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1q4zx3-0005fv-Sa for bug-gnu-emacs@gnu.org; Fri, 02 Jun 2023 04:16:01 -0400 Original-Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1q4zx3-0001ct-Ke for bug-gnu-emacs@gnu.org; Fri, 02 Jun 2023 04:16:01 -0400 X-Loop: help-debbugs@gnu.org Resent-From: Robert Pluim Original-Sender: "Debbugs-submit" Resent-CC: bug-gnu-emacs@gnu.org Resent-Date: Fri, 02 Jun 2023 08:16:01 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 63731 X-GNU-PR-Package: emacs X-GNU-PR-Keywords: patch Original-Received: via spool by 63731-submit@debbugs.gnu.org id=B63731.16856937196196 (code B ref 63731); Fri, 02 Jun 2023 08:16:01 +0000 Original-Received: (at 63731) by debbugs.gnu.org; 2 Jun 2023 08:15:19 +0000 Original-Received: from localhost ([127.0.0.1]:39049 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1q4zwN-0001bp-25 for submit@debbugs.gnu.org; Fri, 02 Jun 2023 04:15:19 -0400 Original-Received: from mail-wm1-f45.google.com ([209.85.128.45]:44136) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1q4zwK-0001bb-Gr for 63731@debbugs.gnu.org; Fri, 02 Jun 2023 04:15:17 -0400 Original-Received: by mail-wm1-f45.google.com with SMTP id 5b1f17b1804b1-3f6077660c6so16520795e9.0 for <63731@debbugs.gnu.org>; Fri, 02 Jun 2023 01:15:16 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20221208; t=1685693710; x=1688285710; h=content-transfer-encoding:mime-version:message-id:date:references :in-reply-to:subject:cc:to:from:from:to:cc:subject:date:message-id :reply-to; bh=HL/cabMWLwFlA8sfKne7ZOgHKPVWfZIlxqXmz720nlQ=; b=Njkl0Vow2AFuqjH151qVJeWWGBTyq549D+/3J8hAhT3oCudIeHLaLq4pCGfReXYVQ/ EsRKSDVQ8jOJ2B1afLflVu2Gfi/Aw0HKnp017YQbvaEmKgsdvHl74gy2SzUcJ4FMAyaW 43gpy6Zkgi7XLlsfmLnGeTUGPxusFPl+pXjGzBTmIaaQHHEp+s0F8i6pO60eaJVlQbHI BQeotYY4F9ldlPeq821qikqmkKly2GYyZxCL1ld0M2kOV5aV817ySbQMYbeftaWLJPcO jejWsPGogKBw88ZGZ647jbPK//40hMOd9g2Ht3QTDgd0a/M2CYY3Jza3aO0SeZY/bcgp 6++Q== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1685693710; x=1688285710; h=content-transfer-encoding:mime-version:message-id:date:references :in-reply-to:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=HL/cabMWLwFlA8sfKne7ZOgHKPVWfZIlxqXmz720nlQ=; b=NxTdxxoyfnuEqCkXH8WURkcGXlpiUNm89u4cYPkqMOpivLeTOgE2x4wIbcpEoPuxDK sEyP3vOyM8AnfQMatNRhQr0RAqWuTWQjHwkbBIFy2eo1R4zxxH1CqM4gHS0zuIG752y+ sZ54arYG4hAPIJEUeDGcACBJ8zJyvKWSwR6XUc2YzoodMQwoa+IBZbPW1ECETNp3jc2U D3mOReVc8g6ppM1ECAUgSearFL3clIVsoxVNF4UX7efh+7MWBu8c8BLGPM/DKBX4QtK0 VO0OuIEoxthU6CMllNYnVKt4T44eyp6A+ACa1sySSkUwwNQgFCx7HVe6ObnuDv62+lbM ANog== X-Gm-Message-State: AC+VfDzClfFtnF5jLtfshsokEvaG+DX1wGkgoVO8PBk6/YbrVhCBDxlL RGhZgxRsi5VJ2Dimd9TYCJ8= X-Google-Smtp-Source: ACHHUZ7J3SM6cKv6aLNE15uhYkodcXM0weViyNqAU6XcN1TL4a+nGlAOdDjC6Ajt1iQXccBS4T3MHA== X-Received: by 2002:a5d:5112:0:b0:30a:8fcb:ec24 with SMTP id s18-20020a5d5112000000b0030a8fcbec24mr4151518wrt.1.1685693710294; Fri, 02 Jun 2023 01:15:10 -0700 (PDT) Original-Received: from rltb ([82.66.8.55]) by smtp.gmail.com with ESMTPSA id k9-20020a056000004900b002c71b4d476asm919608wrx.106.2023.06.02.01.15.09 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 02 Jun 2023 01:15:09 -0700 (PDT) In-Reply-To: <87sfbb9m4y.fsf@gmail.com> (Robert Pluim's message of "Thu, 01 Jun 2023 18:34:53 +0200") X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-BeenThere: bug-gnu-emacs@gnu.org List-Id: "Bug reports for GNU Emacs, the Swiss army knife of text editors" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: bug-gnu-emacs-bounces+geb-bug-gnu-emacs=m.gmane-mx.org@gnu.org Original-Sender: bug-gnu-emacs-bounces+geb-bug-gnu-emacs=m.gmane-mx.org@gnu.org Xref: news.gmane.io gmane.emacs.bugs:262746 Archived-At: >>>>> On Thu, 01 Jun 2023 18:34:53 +0200, Robert Pluim s= aid: Eli> Ready to install this on the emacs-29 branch? Robert> Not today. My brain is fuzzy, and it needs more testing (the pa= tch, Robert> not my brain). So the minimal change to get CHAR+VS-15 and CHAR+VS-16 to compose in all our emoji test files is below. I noticed that we don=CA=BCt compose all the sequences in emoji-test.txt correctly, but I=CA=BCll fix that on master by stealing^Wdrawing inspiration from Lars=CA=BC work. Proper VS-15 support is harder, I need to think about that some more. diff --git c/admin/unidata/emoji-zwj.awk i/admin/unidata/emoji-zwj.awk index 7d2ff6cb900..f13f796bcac 100644 --- c/admin/unidata/emoji-zwj.awk +++ i/admin/unidata/emoji-zwj.awk @@ -106,7 +106,8 @@ END { =20 for (elt in ch) { - printf("(#x%s .\n,(eval-when-compile (regexp-opt\n'(\n%s\n))))\n",= elt, vec[elt]) + entries =3D sprintf("%s\n\"\\N{U+%s}\\N{U+FE0E}\"\n\"\\N{U+%s}\\N{= U+FE0F}\"", vec[elt], elt, elt) + printf("(#x%s .\n,(eval-when-compile (regexp-opt\n'(\n%s\n))))\n",= elt, entries) } print "))" print " (set-char-table-range composition-function-table" diff --git c/lisp/composite.el i/lisp/composite.el index fb8b76114f4..9710c3c371b 100644 --- c/lisp/composite.el +++ i/lisp/composite.el @@ -861,7 +861,7 @@ compose-gstring-for-variation-glyph ;; handled in font_range, we end up choosing the Emoji presentation ;; rather than the Text presentation. (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) el= t)) =20 (defun auto-compose-chars (func from to font-object string direction) Robert --=20