<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head><meta http-equiv="content-type" content="text/html; charset=utf-8" />
<title>[189300] branches/safari-601.1.46-branch</title>
</head>
<body>
<style type="text/css"><!--
#msg dl.meta { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dl.meta dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer, #logmsg { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; }
#msg dl a { font-weight: bold}
#msg dl a:link { color:#fc3; }
#msg dl a:active { color:#ff0; }
#msg dl a:visited { color:#cc6; }
h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: bold; }
#msg pre { overflow: auto; background: #ffc; border: 1px #fa0 solid; padding: 6px; }
#logmsg { background: #ffc; border: 1px #fa0 solid; padding: 1em 1em 0 1em; }
#logmsg p, #logmsg pre, #logmsg blockquote { margin: 0 0 1em 0; }
#logmsg p, #logmsg li, #logmsg dt, #logmsg dd { line-height: 14pt; }
#logmsg h1, #logmsg h2, #logmsg h3, #logmsg h4, #logmsg h5, #logmsg h6 { margin: .5em 0; }
#logmsg h1:first-child, #logmsg h2:first-child, #logmsg h3:first-child, #logmsg h4:first-child, #logmsg h5:first-child, #logmsg h6:first-child { margin-top: 0; }
#logmsg ul, #logmsg ol { padding: 0; list-style-position: inside; margin: 0 0 0 1em; }
#logmsg ul { text-indent: -1em; padding-left: 1em; }#logmsg ol { text-indent: -1.5em; padding-left: 1.5em; }
#logmsg > ul, #logmsg > ol { margin: 0 0 1em 0; }
#logmsg pre { background: #eee; padding: 1em; }
#logmsg blockquote { border: 1px solid #fa0; border-left-width: 10px; padding: 1em 1em 0 1em; background: white;}
#logmsg dl { margin: 0; }
#logmsg dt { font-weight: bold; }
#logmsg dd { margin: 0; padding: 0 0 0.5em 0; }
#logmsg dd:before { content:'\00bb';}
#logmsg table { border-spacing: 0px; border-collapse: collapse; border-top: 4px solid #fa0; border-bottom: 1px solid #fa0; background: #fff; }
#logmsg table th { text-align: left; font-weight: normal; padding: 0.2em 0.5em; border-top: 1px dotted #fa0; }
#logmsg table td { text-align: right; border-top: 1px dotted #fa0; padding: 0.2em 0.5em; }
#logmsg table thead th { text-align: center; border-bottom: 1px solid #fa0; }
#logmsg table th.Corner { text-align: left; }
#logmsg hr { border: none 0; border-top: 2px dashed #fa0; height: 1px; }
#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: 6px; }
#patch { width: 100%; }
#patch h4 {font-family: verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;}
#patch .propset h4, #patch .binary h4 {margin:0;}
#patch pre {padding:0;line-height:1.2em;margin:0;}
#patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;}
#patch .propset .diff, #patch .binary .diff {padding:10px 0;}
#patch span {display:block;padding:0 10px;}
#patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;}
#patch ins {background:#dfd;text-decoration:none;display:block;padding:0 10px;}
#patch del {background:#fdd;text-decoration:none;display:block;padding:0 10px;}
#patch .lines, .info {color:#888;background:#fff;}
--></style>
<div id="msg">
<dl class="meta">
<dt>Revision</dt> <dd><a href="http://trac.webkit.org/projects/webkit/changeset/189300">189300</a></dd>
<dt>Author</dt> <dd>bshafiei@apple.com</dd>
<dt>Date</dt> <dd>2015-09-03 15:37:48 -0700 (Thu, 03 Sep 2015)</dd>
</dl>
<h3>Log Message</h3>
<pre>Merged <a href="http://trac.webkit.org/projects/webkit/changeset/189167">r189167</a>. rdar://problem/22501578</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#branchessafari601146branchLayoutTestsChangeLog">branches/safari-601.1.46-branch/LayoutTests/ChangeLog</a></li>
<li><a href="#branchessafari601146branchLayoutTestseditingdeletingdeleteemojiexpectedtxt">branches/safari-601.1.46-branch/LayoutTests/editing/deleting/delete-emoji-expected.txt</a></li>
<li><a href="#branchessafari601146branchLayoutTestseditingdeletingdeleteemojihtml">branches/safari-601.1.46-branch/LayoutTests/editing/deleting/delete-emoji.html</a></li>
<li><a href="#branchessafari601146branchSourceWebCoreChangeLog">branches/safari-601.1.46-branch/Source/WebCore/ChangeLog</a></li>
<li><a href="#branchessafari601146branchSourceWebCoreplatformtextTextBreakIteratorcpp">branches/safari-601.1.46-branch/Source/WebCore/platform/text/TextBreakIterator.cpp</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="branchessafari601146branchLayoutTestsChangeLog"></a>
<div class="modfile"><h4>Modified: branches/safari-601.1.46-branch/LayoutTests/ChangeLog (189299 => 189300)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-601.1.46-branch/LayoutTests/ChangeLog 2015-09-03 22:33:37 UTC (rev 189299)
+++ branches/safari-601.1.46-branch/LayoutTests/ChangeLog 2015-09-03 22:37:48 UTC (rev 189300)
</span><span class="lines">@@ -1,5 +1,23 @@
</span><span class="cx"> 2015-09-03 Babak Shafiei <bshafiei@apple.com>
</span><span class="cx">
</span><ins>+ Merge r189167.
+
+ 2015-08-31 Enrica Casucci <enrica@apple.com>
+
+ Incorrect cursor movement for U+26F9, U+1F3CB with variations.
+ https://bugs.webkit.org/show_bug.cgi?id=148629
+ rdar://problem/22492366
+
+ Reviewed by Ryosuke Niwa.
+
+ The test has been updated to test these two emoji and to
+ cover the cursor movement as well.
+
+ * editing/deleting/delete-emoji-expected.txt:
+ * editing/deleting/delete-emoji.html:
+
+2015-09-03 Babak Shafiei <bshafiei@apple.com>
+
</ins><span class="cx"> Merge r189022.
</span><span class="cx">
</span><span class="cx"> 2015-08-26 Wenson Hsieh <wenson_hsieh@apple.com>
</span></span></pre></div>
<a id="branchessafari601146branchLayoutTestseditingdeletingdeleteemojiexpectedtxt"></a>
<div class="modfile"><h4>Modified: branches/safari-601.1.46-branch/LayoutTests/editing/deleting/delete-emoji-expected.txt (189299 => 189300)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-601.1.46-branch/LayoutTests/editing/deleting/delete-emoji-expected.txt 2015-09-03 22:33:37 UTC (rev 189299)
+++ branches/safari-601.1.46-branch/LayoutTests/editing/deleting/delete-emoji-expected.txt 2015-09-03 22:37:48 UTC (rev 189300)
</span><span class="lines">@@ -1,65 +1,59 @@
</span><del>-This test verifies that emoji groups and emoji with variations are deleted correctly
</del><ins>+This test verifies that deletions are correct over emoji groups and emoji with variations
</ins><span class="cx">
</span><span class="cx"> Dump of markup 1:
</span><del>-| "π¦π»π¦πΎπ»π¦πΎπ¦π©βπ©βπ¦π©ββ€οΈβπ©π¨ββ€οΈβπ¨π©ββ€οΈβπβπ©π¨ββ€οΈβπβπ¨βοΈπ»βπΎβΉπΎππΎππΎπ€πΎπ΅πΎπ΄πΎππΎπβπ¨<#selection-caret>
</del><ins>+| "π¦π»π¦πΎπ»π¦πΎπ¦π©βπ©βπ¦π©ββ€οΈβπ©π¨ββ€οΈβπ¨π©ββ€οΈβπβπ©π¨ββ€οΈβπβπ¨βοΈπ»βπΎβΉπΎππΎππΎπ€πΎπβπ¨ππΎ<#selection-caret>
</ins><span class="cx"> "
</span><span class="cx">
</span><span class="cx"> Dump of markup 2:
</span><del>-| "π¦π»π¦πΎπ»π¦πΎπ¦π©βπ©βπ¦π©ββ€οΈβπ©π¨ββ€οΈβπ¨π©ββ€οΈβπβπ©π¨ββ€οΈβπβπ¨βοΈπ»βπΎβΉπΎππΎππΎπ€πΎπ΅πΎπ΄πΎππΎ<#selection-caret>"
</del><ins>+| "π¦π»π¦πΎπ»π¦πΎπ¦π©βπ©βπ¦π©ββ€οΈβπ©π¨ββ€οΈβπ¨π©ββ€οΈβπβπ©π¨ββ€οΈβπβπ¨βοΈπ»βπΎβΉπΎππΎππΎπ€πΎπβπ¨<#selection-caret>"
</ins><span class="cx">
</span><span class="cx"> Dump of markup 3:
</span><del>-| "π¦π»π¦πΎπ»π¦πΎπ¦π©βπ©βπ¦π©ββ€οΈβπ©π¨ββ€οΈβπ¨π©ββ€οΈβπβπ©π¨ββ€οΈβπβπ¨βοΈπ»βπΎβΉπΎππΎππΎπ€πΎπ΅πΎπ΄πΎ<#selection-caret>"
-
-Dump of markup 4:
-| "π¦π»π¦πΎπ»π¦πΎπ¦π©βπ©βπ¦π©ββ€οΈβπ©π¨ββ€οΈβπ¨π©ββ€οΈβπβπ©π¨ββ€οΈβπβπ¨βοΈπ»βπΎβΉπΎππΎππΎπ€πΎπ΅πΎ<#selection-caret>"
-
-Dump of markup 5:
</del><span class="cx"> | "π¦π»π¦πΎπ»π¦πΎπ¦π©βπ©βπ¦π©ββ€οΈβπ©π¨ββ€οΈβπ¨π©ββ€οΈβπβπ©π¨ββ€οΈβπβπ¨βοΈπ»βπΎβΉπΎππΎππΎπ€πΎ<#selection-caret>"
</span><span class="cx">
</span><del>-Dump of markup 6:
</del><ins>+Dump of markup 4:
</ins><span class="cx"> | "π¦π»π¦πΎπ»π¦πΎπ¦π©βπ©βπ¦π©ββ€οΈβπ©π¨ββ€οΈβπ¨π©ββ€οΈβπβπ©π¨ββ€οΈβπβπ¨βοΈπ»βπΎβΉπΎππΎππΎ<#selection-caret>"
</span><span class="cx">
</span><del>-Dump of markup 7:
</del><ins>+Dump of markup 5:
</ins><span class="cx"> | "π¦π»π¦πΎπ»π¦πΎπ¦π©βπ©βπ¦π©ββ€οΈβπ©π¨ββ€οΈβπ¨π©ββ€οΈβπβπ©π¨ββ€οΈβπβπ¨βοΈπ»βπΎβΉπΎππΎ<#selection-caret>"
</span><span class="cx">
</span><del>-Dump of markup 8:
</del><ins>+Dump of markup 6:
</ins><span class="cx"> | "π¦π»π¦πΎπ»π¦πΎπ¦π©βπ©βπ¦π©ββ€οΈβπ©π¨ββ€οΈβπ¨π©ββ€οΈβπβπ©π¨ββ€οΈβπβπ¨βοΈπ»βπΎβΉπΎ<#selection-caret>"
</span><span class="cx">
</span><del>-Dump of markup 9:
</del><ins>+Dump of markup 7:
</ins><span class="cx"> | "π¦π»π¦πΎπ»π¦πΎπ¦π©βπ©βπ¦π©ββ€οΈβπ©π¨ββ€οΈβπ¨π©ββ€οΈβπβπ©π¨ββ€οΈβπβπ¨βοΈπ»βπΎ<#selection-caret>"
</span><span class="cx">
</span><del>-Dump of markup 10:
</del><ins>+Dump of markup 8:
</ins><span class="cx"> | "π¦π»π¦πΎπ»π¦πΎπ¦π©βπ©βπ¦π©ββ€οΈβπ©π¨ββ€οΈβπ¨π©ββ€οΈβπβπ©π¨ββ€οΈβπβπ¨βοΈπ»<#selection-caret>"
</span><span class="cx">
</span><del>-Dump of markup 11:
</del><ins>+Dump of markup 9:
</ins><span class="cx"> | "π¦π»π¦πΎπ»π¦πΎπ¦π©βπ©βπ¦π©ββ€οΈβπ©π¨ββ€οΈβπ¨π©ββ€οΈβπβπ©π¨ββ€οΈβπβπ¨<#selection-caret>"
</span><span class="cx">
</span><del>-Dump of markup 12:
</del><ins>+Dump of markup 10:
</ins><span class="cx"> | "π¦π»π¦πΎπ»π¦πΎπ¦π©βπ©βπ¦π©ββ€οΈβπ©π¨ββ€οΈβπ¨π©ββ€οΈβπβπ©<#selection-caret>"
</span><span class="cx">
</span><del>-Dump of markup 13:
</del><ins>+Dump of markup 11:
</ins><span class="cx"> | "π¦π»π¦πΎπ»π¦πΎπ¦π©βπ©βπ¦π©ββ€οΈβπ©π¨ββ€οΈβπ¨<#selection-caret>"
</span><span class="cx">
</span><del>-Dump of markup 14:
</del><ins>+Dump of markup 12:
</ins><span class="cx"> | "π¦π»π¦πΎπ»π¦πΎπ¦π©βπ©βπ¦π©ββ€οΈβπ©<#selection-caret>"
</span><span class="cx">
</span><del>-Dump of markup 15:
</del><ins>+Dump of markup 13:
</ins><span class="cx"> | "π¦π»π¦πΎπ»π¦πΎπ¦π©βπ©βπ¦<#selection-caret>"
</span><span class="cx">
</span><del>-Dump of markup 16:
</del><ins>+Dump of markup 14:
</ins><span class="cx"> | "π¦π»π¦πΎπ»π¦πΎπ¦<#selection-caret>"
</span><span class="cx">
</span><del>-Dump of markup 17:
</del><ins>+Dump of markup 15:
</ins><span class="cx"> | "π¦π»π¦πΎπ»π¦πΎ<#selection-caret>"
</span><span class="cx">
</span><del>-Dump of markup 18:
</del><ins>+Dump of markup 16:
</ins><span class="cx"> | "π¦π»π¦πΎπ»<#selection-caret>"
</span><span class="cx">
</span><del>-Dump of markup 19:
</del><ins>+Dump of markup 17:
</ins><span class="cx"> | "π¦π»π¦πΎ<#selection-caret>"
</span><span class="cx">
</span><del>-Dump of markup 20:
</del><ins>+Dump of markup 18:
</ins><span class="cx"> | "π¦π»<#selection-caret>"
</span><span class="cx">
</span><del>-Dump of markup 21:
</del><ins>+Dump of markup 19:
</ins><span class="cx"> | <br>
</span></span></pre></div>
<a id="branchessafari601146branchLayoutTestseditingdeletingdeleteemojihtml"></a>
<div class="modfile"><h4>Modified: branches/safari-601.1.46-branch/LayoutTests/editing/deleting/delete-emoji.html (189299 => 189300)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-601.1.46-branch/LayoutTests/editing/deleting/delete-emoji.html 2015-09-03 22:33:37 UTC (rev 189299)
+++ branches/safari-601.1.46-branch/LayoutTests/editing/deleting/delete-emoji.html 2015-09-03 22:37:48 UTC (rev 189300)
</span><span class="lines">@@ -1,11 +1,11 @@
</span><span class="cx"> <!DOCTYPE html>
</span><span class="cx"> <html>
</span><span class="cx"> <body>
</span><del>-<div id="test" contenteditable="true">&#x1F466;&#x1F3FB;&#x1F466;&#x1F3FE;&#x1F3FB;&#x1F466;&#x1F3FE;&#x1F466;&#x1F469;&#x200D;&#x1F469;&#x200D;&#x1F466;&#x1F469;&#x200D;&#x2764;&#xFE0F;&#x200D;&#x1F469;&#x1F468;&#x200D;&#x2764;&#xFE0F;&#x200D;&#x1F468;&#x1F469;&#x200D;&#x2764;&#xFE0F;&#x200D;&#x1F48B;&#x200D;&#x1F469;&#x1F468;&#x200D;&#x2764;&#xFE0F;&#x200D;&#x1F48B;&#x200D;&#x1F468;&#x261D;&#xFE0F;&#x1F3FB;&#x270D;&#x1F3FE;&#x26F9;&#x1F3FE;&#x1F590;&#x1F3FE;&#x1F595;&#x1F3FE;&#x1F918;&#x1F3FE;&#x1F575;&#x1F3FE;&#x1F574;&#x1F3FE;&#x1F3CB;&#x1F3FE;&#x1F441;&#x200D;&#x1F5E8;
</del><ins>+<div id="test" contenteditable="true">&#x1F466;&#x1F3FB;&#x1F466;&#x1F3FE;&#x1F3FB;&#x1F466;&#x1F3FE;&#x1F466;&#x1F469;&#x200D;&#x1F469;&#x200D;&#x1F466;&#x1F469;&#x200D;&#x2764;&#xFE0F;&#x200D;&#x1F469;&#x1F468;&#x200D;&#x2764;&#xFE0F;&#x200D;&#x1F468;&#x1F469;&#x200D;&#x2764;&#xFE0F;&#x200D;&#x1F48B;&#x200D;&#x1F469;&#x1F468;&#x200D;&#x2764;&#xFE0F;&#x200D;&#x1F48B;&#x200D;&#x1F468;&#x261D;&#xFE0F;&#x1F3FB;&#x270D;&#x1F3FE;&#x26F9;&#x1F3FE;&#x1F590;&#x1F3FE;&#x1F595;&#x1F3FE;&#x1F918;&#x1F3FE;&#x1F441;&#x200D;&#x1F5E8;&#x1F3CB;&#x1F3FE;
</ins><span class="cx"> </div>
</span><span class="cx"> <script src="../../resources/dump-as-markup.js"></script>
</span><span class="cx"> <script>
</span><del>-Markup.description("This test verifies that emoji groups and emoji with variations are deleted correctly");
</del><ins>+Markup.description("This test verifies that deletions are correct over emoji groups and emoji with variations");
</ins><span class="cx"> var testElement = document.getElementById('test');
</span><span class="cx"> getSelection().setBaseAndExtent(testElement.firstChild, testElement.firstChild.length, testElement.firstChild, testElement.firstChild.length);
</span><span class="cx"> Markup.dump("test");
</span><span class="lines">@@ -13,6 +13,7 @@
</span><span class="cx"> document.execCommand("Delete");
</span><span class="cx"> Markup.dump("test");
</span><span class="cx"> }
</span><ins>+
</ins><span class="cx"> </script>
</span><span class="cx"> </body>
</span><span class="cx"> </html>
</span></span></pre></div>
<a id="branchessafari601146branchSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: branches/safari-601.1.46-branch/Source/WebCore/ChangeLog (189299 => 189300)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-601.1.46-branch/Source/WebCore/ChangeLog 2015-09-03 22:33:37 UTC (rev 189299)
+++ branches/safari-601.1.46-branch/Source/WebCore/ChangeLog 2015-09-03 22:37:48 UTC (rev 189300)
</span><span class="lines">@@ -1,3 +1,20 @@
</span><ins>+2015-09-03 Babak Shafiei <bshafiei@apple.com>
+
+ Merge r189167.
+
+ 2015-08-31 Enrica Casucci <enrica@apple.com>
+
+ Incorrect cursor movement for U+26F9, U+1F3CB with variations.
+ https://bugs.webkit.org/show_bug.cgi?id=148629
+ rdar://problem/22492366
+
+ Reviewed by Ryosuke Niwa.
+
+ Updating text break iterator rules to correctly handle those two emoji with variations.
+
+ * platform/text/TextBreakIterator.cpp:
+ (WebCore::cursorMovementIterator):
+
</ins><span class="cx"> 2015-08-27 Babak Shafiei <bshafiei@apple.com>
</span><span class="cx">
</span><span class="cx"> Merge r189024.
</span></span></pre></div>
<a id="branchessafari601146branchSourceWebCoreplatformtextTextBreakIteratorcpp"></a>
<div class="modfile"><h4>Modified: branches/safari-601.1.46-branch/Source/WebCore/platform/text/TextBreakIterator.cpp (189299 => 189300)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-601.1.46-branch/Source/WebCore/platform/text/TextBreakIterator.cpp 2015-09-03 22:33:37 UTC (rev 189299)
+++ branches/safari-601.1.46-branch/Source/WebCore/platform/text/TextBreakIterator.cpp 2015-09-03 22:37:48 UTC (rev 189300)
</span><span class="lines">@@ -214,7 +214,7 @@
</span><span class="cx"> "$EmojiVar = [\\uFE0F];" // Emoji-style variation selector
</span><span class="cx"> #if ADDITIONAL_EMOJI_SUPPORT
</span><span class="cx"> "$EmojiForSeqs = [\\u2764 \\U0001F441 \\U0001F466-\\U0001F469 \\U0001F48B \\U0001F5E8];" // Emoji that participate in ZWJ sequences
</span><del>- "$EmojiForMods = [\\u261D \\u270A-\\u270D \\U0001F385 \\U0001F3C3-\\U0001F3C4 \\U0001F3C7 \\U0001F3CA \\U0001F442-\\U0001F443 \\U0001F446-\\U0001F450 \\U0001F466-\\U0001F469 \\U0001F46E-\\U0001F478 \\U0001F47C \\U0001F481-\\U0001F483 \\U0001F485-\\U0001F487 \\U0001F4AA \\U0001F590 \\U0001F595 \\U0001F596 \\U0001F645-\\U0001F647 \\U0001F64B-\\U0001F64F \\U0001F6A3 \\U0001F6B4-\\U0001F6B6 \\U0001F6C0 \\U0001F918] ;" // Emoji that take Fitzpatrick modifiers
</del><ins>+ "$EmojiForMods = [\\u261D \\u26F9 \\u270A-\\u270D \\U0001F385 \\U0001F3C3-\\U0001F3C4 \\U0001F3C7 \\U0001F3CA \\U0001F3CB \\U0001F442-\\U0001F443 \\U0001F446-\\U0001F450 \\U0001F466-\\U0001F469 \\U0001F46E-\\U0001F478 \\U0001F47C \\U0001F481-\\U0001F483 \\U0001F485-\\U0001F487 \\U0001F4AA \\U0001F590 \\U0001F595 \\U0001F596 \\U0001F645-\\U0001F647 \\U0001F64B-\\U0001F64F \\U0001F6A3 \\U0001F6B4-\\U0001F6B6 \\U0001F6C0 \\U0001F918] ;" // Emoji that take Fitzpatrick modifiers
</ins><span class="cx"> #else
</span><span class="cx"> "$EmojiForSeqs = [\\u2764 \\U0001F466-\\U0001F469 \\U0001F48B];" // Emoji that participate in ZWJ sequences
</span><span class="cx"> "$EmojiForMods = [\\u261D \\u270A-\\u270C \\U0001F385 \\U0001F3C3-\\U0001F3C4 \\U0001F3C7 \\U0001F3CA \\U0001F442-\\U0001F443 \\U0001F446-\\U0001F450 \\U0001F466-\\U0001F469 \\U0001F46E-\\U0001F478 \\U0001F47C \\U0001F481-\\U0001F483 \\U0001F485-\\U0001F487 \\U0001F4AA \\U0001F596 \\U0001F645-\\U0001F647 \\U0001F64B-\\U0001F64F \\U0001F6A3 \\U0001F6B4-\\U0001F6B6 \\U0001F6C0] ;" // Emoji that take Fitzpatrick modifiers
</span><span class="lines">@@ -447,7 +447,7 @@
</span><span class="cx"> "$EmojiVar = \\uFE0F;"
</span><span class="cx"> #if ADDITIONAL_EMOJI_SUPPORT
</span><span class="cx"> "$EmojiForSeqs = [\\u2764 \\U0001F441 \\U0001F466-\\U0001F469 \\U0001F48B \\U0001F5E8];"
</span><del>- "$EmojiForMods = [\\u261D \\u270A-\\u270D \\U0001F385 \\U0001F3C3-\\U0001F3C4 \\U0001F3C7 \\U0001F3CA \\U0001F442-\\U0001F443 \\U0001F446-\\U0001F450 \\U0001F466-\\U0001F469 \\U0001F46E-\\U0001F478 \\U0001F47C \\U0001F481-\\U0001F483 \\U0001F485-\\U0001F487 \\U0001F4AA \\U0001F590 \\U0001F595 \\U0001F596 \\U0001F645-\\U0001F647 \\U0001F64B-\\U0001F64F \\U0001F6A3 \\U0001F6B4-\\U0001F6B6 \\U0001F6C0 \\U0001F918] ;" // Emoji that take Fitzpatrick modifiers
</del><ins>+ "$EmojiForMods = [\\u261D \\u26F9 \\u270A-\\u270D \\U0001F385 \\U0001F3C3-\\U0001F3C4 \\U0001F3C7 \\U0001F3CA \\U0001F3CB \\U0001F442-\\U0001F443 \\U0001F446-\\U0001F450 \\U0001F466-\\U0001F469 \\U0001F46E-\\U0001F478 \\U0001F47C \\U0001F481-\\U0001F483 \\U0001F485-\\U0001F487 \\U0001F4AA \\U0001F590 \\U0001F595 \\U0001F596 \\U0001F645-\\U0001F647 \\U0001F64B-\\U0001F64F \\U0001F6A3 \\U0001F6B4-\\U0001F6B6 \\U0001F6C0 \\U0001F918] ;" // Emoji that take Fitzpatrick modifiers
</ins><span class="cx"> #else
</span><span class="cx"> "$EmojiForSeqs = [\\u2764 \\U0001F466-\\U0001F469 \\U0001F48B];"
</span><span class="cx"> "$EmojiForMods = [\\u261D \\u270A-\\u270C \\U0001F385 \\U0001F3C3-\\U0001F3C4 \\U0001F3C7 \\U0001F3CA \\U0001F442-\\U0001F443 \\U0001F446-\\U0001F450 \\U0001F466-\\U0001F469 \\U0001F46E-\\U0001F478 \\U0001F47C \\U0001F481-\\U0001F483 \\U0001F485-\\U0001F487 \\U0001F4AA \\U0001F596 \\U0001F645-\\U0001F647 \\U0001F64B-\\U0001F64F \\U0001F6A3 \\U0001F6B4-\\U0001F6B6 \\U0001F6C0] ;" // Emoji that take Fitzpatrick modifiers
</span></span></pre>
</div>
</div>
</body>
</html>