<!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>[193967] branches/safari-601-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/193967">193967</a></dd>
<dt>Author</dt> <dd>matthew_hanson@apple.com</dd>
<dt>Date</dt> <dd>2015-12-11 10:26:41 -0800 (Fri, 11 Dec 2015)</dd>
</dl>

<h3>Log Message</h3>
<pre>Merge <a href="http://trac.webkit.org/projects/webkit/changeset/193922">r193922</a>. rdar://problem/23727472</pre>

<h3>Modified Paths</h3>
<ul>
<li><a href="#branchessafari601branchLayoutTestsChangeLog">branches/safari-601-branch/LayoutTests/ChangeLog</a></li>
<li><a href="#branchessafari601branchLayoutTestsfasttextemojihtml">branches/safari-601-branch/LayoutTests/fast/text/emoji.html</a></li>
<li><a href="#branchessafari601branchLayoutTestsplatformmacfasttextemojiexpectedtxt">branches/safari-601-branch/LayoutTests/platform/mac/fast/text/emoji-expected.txt</a></li>
<li><a href="#branchessafari601branchSourceWebCoreChangeLog">branches/safari-601-branch/Source/WebCore/ChangeLog</a></li>
<li><a href="#branchessafari601branchSourceWebCoreplatformtextTextBreakIteratorcpp">branches/safari-601-branch/Source/WebCore/platform/text/TextBreakIterator.cpp</a></li>
</ul>

</div>
<div id="patch">
<h3>Diff</h3>
<a id="branchessafari601branchLayoutTestsChangeLog"></a>
<div class="modfile"><h4>Modified: branches/safari-601-branch/LayoutTests/ChangeLog (193966 => 193967)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-601-branch/LayoutTests/ChangeLog        2015-12-11 18:26:38 UTC (rev 193966)
+++ branches/safari-601-branch/LayoutTests/ChangeLog        2015-12-11 18:26:41 UTC (rev 193967)
</span><span class="lines">@@ -1,5 +1,21 @@
</span><span class="cx"> 2015-12-11  Matthew Hanson  &lt;matthew_hanson@apple.com&gt;
</span><span class="cx"> 
</span><ins>+        Merge r193922. rdar://problem/23727472
+
+    2015-12-10  Enrica Casucci  &lt;enrica@apple.com&gt;
+
+            Change skin tone support for two emoji.
+            https://bugs.webkit.org/show_bug.cgi?id=152147
+            rdar://problem/23716993
+            rdar://problem/23716344
+
+            Reviewed by Darin Adler.
+
+            * fast/text/emoji.html:
+            * platform/mac/fast/text/emoji-expected.txt:
+
+2015-12-11  Matthew Hanson  &lt;matthew_hanson@apple.com&gt;
+
</ins><span class="cx">         Merge r193859. rdar://problem/23814477
</span><span class="cx"> 
</span><span class="cx">     2015-12-09  David Hyatt  &lt;hyatt@apple.com&gt;
</span></span></pre></div>
<a id="branchessafari601branchLayoutTestsfasttextemojihtml"></a>
<div class="modfile"><h4>Modified: branches/safari-601-branch/LayoutTests/fast/text/emoji.html (193966 => 193967)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-601-branch/LayoutTests/fast/text/emoji.html        2015-12-11 18:26:38 UTC (rev 193966)
+++ branches/safari-601-branch/LayoutTests/fast/text/emoji.html        2015-12-11 18:26:41 UTC (rev 193967)
</span><span class="lines">@@ -1,9 +1,9 @@
</span><span class="cx"> &lt;html&gt;
</span><span class="cx"> &lt;body&gt;
</span><del>-    This test validate rendering of emoji sequences and emoji with modifiers.
</del><ins>+    This test validate rendering of emoji sequences and emoji with modifiers. Horse racing emoji no longer supports skin tone. Added skin tone to spy.
</ins><span class="cx"> &lt;div style=&quot;font-family: 'Apple Color Emoji';&quot;&gt;&amp;#x1f601;&lt;/div&gt;
</span><del>-&lt;div style='font-size: 36px'&gt;
-&amp;#x1F466;&amp;#x1F3FB;&amp;#x1F469;&amp;#x1F3FC;&amp;#x1F466;&amp;#x1F3FE;&amp;#x2764;&amp;#xFE0F;&amp;#x1F48B;&lt;br&gt;
</del><ins>+&lt;div style='font-size: 64px'&gt;
+&amp;#x1F466;&amp;#x1F3FB;&amp;#x1F469;&amp;#x1F3FC;&amp;#x1F466;&amp;#x1F3FE;&amp;#x2764;&amp;#xFE0F;&amp;#x1F48B;&amp;#x1F575;&amp;#x1F3FB;&amp;#x1F3C7;&amp;#x1F3FB;&lt;br&gt;
</ins><span class="cx"> &amp;#x1F468;&amp;#x200D;&amp;#x1F469;&amp;#x200D;&amp;#x1F466; &amp;#x1F468;&amp;#x200D;&amp;#x1F469;&amp;#x200D;&amp;#x1F467; &amp;#x1F46A; &amp;#x1F466;&amp;#x1F3FB;&amp;#x1F469;&amp;#x1F3FC;&amp;#x1F466;&amp;#x1F3FE;&lt;br&gt;
</span><span class="cx"> &amp;#x1F469;&amp;#x200D;&amp;#x1F469;&amp;#x200D;&amp;#x1F466; &amp;#x1F469;&amp;#x200D;&amp;#x1F469;&amp;#x200D;&amp;#x1F467; &amp;#x1F469;&amp;#x200D;&amp;#x1F469;&amp;#x200D;&amp;#x1F467;&amp;#x200D;&amp;#x1F466; &amp;#x1F469;&amp;#x200D;&amp;#x1F469;&amp;#x200D;&amp;#x1F466;&amp;#x200D;&amp;#x1F466; &amp;#x1F469;&amp;#x200D;&amp;#x1F469;&amp;#x200D;&amp;#x1F467;&amp;#x200D;&amp;#x1F467;&lt;br&gt;
</span><span class="cx"> &amp;#x1F468;&amp;#x200D;&amp;#x1F468;&amp;#x200D;&amp;#x1F466; &amp;#x1F468;&amp;#x200D;&amp;#x1F468;&amp;#x200D;&amp;#x1F467; &amp;#x1F468;&amp;#x200D;&amp;#x1F468;&amp;#x200D;&amp;#x1F467;&amp;#x200D;&amp;#x1F466; &amp;#x1F468;&amp;#x200D;&amp;#x1F468;&amp;#x200D;&amp;#x1F466;&amp;#x200D;&amp;#x1F466; &amp;#x1F468;&amp;#x200D;&amp;#x1F468;&amp;#x200D;&amp;#x1F467;&amp;#x200D;&amp;#x1F467;&lt;br&gt;
</span></span></pre></div>
<a id="branchessafari601branchLayoutTestsplatformmacfasttextemojiexpectedtxt"></a>
<div class="modfile"><h4>Modified: branches/safari-601-branch/LayoutTests/platform/mac/fast/text/emoji-expected.txt (193966 => 193967)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-601-branch/LayoutTests/platform/mac/fast/text/emoji-expected.txt        2015-12-11 18:26:38 UTC (rev 193966)
+++ branches/safari-601-branch/LayoutTests/platform/mac/fast/text/emoji-expected.txt        2015-12-11 18:26:41 UTC (rev 193967)
</span><span class="lines">@@ -3,24 +3,25 @@
</span><span class="cx"> layer at (0,0) size 800x600
</span><span class="cx">   RenderBlock {HTML} at (0,0) size 800x600
</span><span class="cx">     RenderBody {BODY} at (8,8) size 784x584
</span><del>-      RenderBlock (anonymous) at (0,0) size 784x18
-        RenderText {#text} at (0,0) size 470x18
-          text run at (0,0) width 470: &quot;This test validate rendering of emoji sequences and emoji with modifiers.&quot;
-      RenderBlock {DIV} at (0,18) size 784x21
</del><ins>+      RenderBlock (anonymous) at (0,0) size 784x36
+        RenderText {#text} at (0,0) size 751x36
+          text run at (0,0) width 751: &quot;This test validate rendering of emoji sequences and emoji with modifiers. Horse racing emoji no longer supports skin&quot;
+          text run at (0,18) width 187: &quot;tone. Added skin tone to spy.&quot;
+      RenderBlock {DIV} at (0,36) size 784x21
</ins><span class="cx">         RenderText {#text} at (0,0) size 21x21
</span><span class="cx">           text run at (0,0) width 21: &quot;\x{D83D}\x{DE01}&quot;
</span><del>-      RenderBlock {DIV} at (0,39) size 784x235
-        RenderText {#text} at (0,4) size 180x41
-          text run at (0,4) width 180: &quot;\x{D83D}\x{DC66}\x{D83C}\x{DFFB}\x{D83D}\x{DC69}\x{D83C}\x{DFFC}\x{D83D}\x{DC66}\x{D83C}\x{DFFE}\x{2764}\x{FE0F}\x{D83D}\x{DC8B}&quot;
-        RenderBR {BR} at (180,36) size 0x0
-        RenderText {#text} at (0,51) size 243x41
-          text run at (0,51) width 243: &quot;\x{D83D}\x{DC68}\x{200D}\x{D83D}\x{DC69}\x{200D}\x{D83D}\x{DC66} \x{D83D}\x{DC68}\x{200D}\x{D83D}\x{DC69}\x{200D}\x{D83D}\x{DC67} \x{D83D}\x{DC6A} \x{D83D}\x{DC66}\x{D83C}\x{DFFB}\x{D83D}\x{DC69}\x{D83C}\x{DFFC}\x{D83D}\x{DC66}\x{D83C}\x{DFFE}&quot;
-        RenderBR {BR} at (243,83) size 0x0
-        RenderText {#text} at (0,98) size 216x41
-          text run at (0,98) width 216: &quot;\x{D83D}\x{DC69}\x{200D}\x{D83D}\x{DC69}\x{200D}\x{D83D}\x{DC66} \x{D83D}\x{DC69}\x{200D}\x{D83D}\x{DC69}\x{200D}\x{D83D}\x{DC67} \x{D83D}\x{DC69}\x{200D}\x{D83D}\x{DC69}\x{200D}\x{D83D}\x{DC67}\x{200D}\x{D83D}\x{DC66} \x{D83D}\x{DC69}\x{200D}\x{D83D}\x{DC69}\x{200D}\x{D83D}\x{DC66}\x{200D}\x{D83D}\x{DC66} \x{D83D}\x{DC69}\x{200D}\x{D83D}\x{DC69}\x{200D}\x{D83D}\x{DC67}\x{200D}\x{D83D}\x{DC67}&quot;
-        RenderBR {BR} at (216,130) size 0x0
-        RenderText {#text} at (0,145) size 216x41
-          text run at (0,145) width 216: &quot;\x{D83D}\x{DC68}\x{200D}\x{D83D}\x{DC68}\x{200D}\x{D83D}\x{DC66} \x{D83D}\x{DC68}\x{200D}\x{D83D}\x{DC68}\x{200D}\x{D83D}\x{DC67} \x{D83D}\x{DC68}\x{200D}\x{D83D}\x{DC68}\x{200D}\x{D83D}\x{DC67}\x{200D}\x{D83D}\x{DC66} \x{D83D}\x{DC68}\x{200D}\x{D83D}\x{DC68}\x{200D}\x{D83D}\x{DC66}\x{200D}\x{D83D}\x{DC66} \x{D83D}\x{DC68}\x{200D}\x{D83D}\x{DC68}\x{200D}\x{D83D}\x{DC67}\x{200D}\x{D83D}\x{DC67}&quot;
-        RenderBR {BR} at (216,177) size 0x0
-        RenderText {#text} at (0,192) size 216x41
-          text run at (0,192) width 216: &quot;\x{D83D}\x{DC69}\x{200D}\x{2764}\x{FE0F}\x{200D}\x{D83D}\x{DC69} \x{D83D}\x{DC68}\x{200D}\x{2764}\x{FE0F}\x{200D}\x{D83D}\x{DC68} \x{D83D}\x{DC69}\x{200D}\x{2764}\x{FE0F}\x{200D}\x{D83D}\x{DC8B}\x{200D}\x{D83D}\x{DC69} \x{D83D}\x{DC68}\x{200D}\x{2764}\x{FE0F}\x{200D}\x{D83D}\x{DC8B}\x{200D}\x{D83D}\x{DC68} \x{D83D}\x{DC69}\x{200D}\x{2764}\x{FE0F}\x{200D}\x{D83D}\x{DC69}&quot;
</del><ins>+      RenderBlock {DIV} at (0,57) size 784x420
+        RenderText {#text} at (0,6) size 512x74
+          text run at (0,6) width 512: &quot;\x{D83D}\x{DC66}\x{D83C}\x{DFFB}\x{D83D}\x{DC69}\x{D83C}\x{DFFC}\x{D83D}\x{DC66}\x{D83C}\x{DFFE}\x{2764}\x{FE0F}\x{D83D}\x{DC8B}\x{D83D}\x{DD75}\x{D83C}\x{DFFB}\x{D83C}\x{DFC7}\x{D83C}\x{DFFB}&quot;
+        RenderBR {BR} at (512,64) size 0x0
+        RenderText {#text} at (0,90) size 432x74
+          text run at (0,90) width 432: &quot;\x{D83D}\x{DC68}\x{200D}\x{D83D}\x{DC69}\x{200D}\x{D83D}\x{DC66} \x{D83D}\x{DC68}\x{200D}\x{D83D}\x{DC69}\x{200D}\x{D83D}\x{DC67} \x{D83D}\x{DC6A} \x{D83D}\x{DC66}\x{D83C}\x{DFFB}\x{D83D}\x{DC69}\x{D83C}\x{DFFC}\x{D83D}\x{DC66}\x{D83C}\x{DFFE}&quot;
+        RenderBR {BR} at (432,148) size 0x0
+        RenderText {#text} at (0,174) size 384x74
+          text run at (0,174) width 384: &quot;\x{D83D}\x{DC69}\x{200D}\x{D83D}\x{DC69}\x{200D}\x{D83D}\x{DC66} \x{D83D}\x{DC69}\x{200D}\x{D83D}\x{DC69}\x{200D}\x{D83D}\x{DC67} \x{D83D}\x{DC69}\x{200D}\x{D83D}\x{DC69}\x{200D}\x{D83D}\x{DC67}\x{200D}\x{D83D}\x{DC66} \x{D83D}\x{DC69}\x{200D}\x{D83D}\x{DC69}\x{200D}\x{D83D}\x{DC66}\x{200D}\x{D83D}\x{DC66} \x{D83D}\x{DC69}\x{200D}\x{D83D}\x{DC69}\x{200D}\x{D83D}\x{DC67}\x{200D}\x{D83D}\x{DC67}&quot;
+        RenderBR {BR} at (384,232) size 0x0
+        RenderText {#text} at (0,258) size 384x74
+          text run at (0,258) width 384: &quot;\x{D83D}\x{DC68}\x{200D}\x{D83D}\x{DC68}\x{200D}\x{D83D}\x{DC66} \x{D83D}\x{DC68}\x{200D}\x{D83D}\x{DC68}\x{200D}\x{D83D}\x{DC67} \x{D83D}\x{DC68}\x{200D}\x{D83D}\x{DC68}\x{200D}\x{D83D}\x{DC67}\x{200D}\x{D83D}\x{DC66} \x{D83D}\x{DC68}\x{200D}\x{D83D}\x{DC68}\x{200D}\x{D83D}\x{DC66}\x{200D}\x{D83D}\x{DC66} \x{D83D}\x{DC68}\x{200D}\x{D83D}\x{DC68}\x{200D}\x{D83D}\x{DC67}\x{200D}\x{D83D}\x{DC67}&quot;
+        RenderBR {BR} at (384,316) size 0x0
+        RenderText {#text} at (0,342) size 384x74
+          text run at (0,342) width 384: &quot;\x{D83D}\x{DC69}\x{200D}\x{2764}\x{FE0F}\x{200D}\x{D83D}\x{DC69} \x{D83D}\x{DC68}\x{200D}\x{2764}\x{FE0F}\x{200D}\x{D83D}\x{DC68} \x{D83D}\x{DC69}\x{200D}\x{2764}\x{FE0F}\x{200D}\x{D83D}\x{DC8B}\x{200D}\x{D83D}\x{DC69} \x{D83D}\x{DC68}\x{200D}\x{2764}\x{FE0F}\x{200D}\x{D83D}\x{DC8B}\x{200D}\x{D83D}\x{DC68} \x{D83D}\x{DC69}\x{200D}\x{2764}\x{FE0F}\x{200D}\x{D83D}\x{DC69}&quot;
</ins></span></pre></div>
<a id="branchessafari601branchSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: branches/safari-601-branch/Source/WebCore/ChangeLog (193966 => 193967)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-601-branch/Source/WebCore/ChangeLog        2015-12-11 18:26:38 UTC (rev 193966)
+++ branches/safari-601-branch/Source/WebCore/ChangeLog        2015-12-11 18:26:41 UTC (rev 193967)
</span><span class="lines">@@ -1,5 +1,24 @@
</span><span class="cx"> 2015-12-11  Matthew Hanson  &lt;matthew_hanson@apple.com&gt;
</span><span class="cx"> 
</span><ins>+        Merge r193922. rdar://problem/23727472
+
+    2015-12-10  Enrica Casucci  &lt;enrica@apple.com&gt;
+
+            Change skin tone support for two emoji.
+            https://bugs.webkit.org/show_bug.cgi?id=152147
+            rdar://problem/23716993
+            rdar://problem/23716344
+
+            Reviewed by Darin Adler.
+
+            Horse race emoji (1F3C7) should no longer have skin tone variation.
+            Sleuth/Spy emoji (!F575) should instead have skin tone variation.
+
+            * platform/text/TextBreakIterator.cpp:
+            (WebCore::cursorMovementIterator):
+
+2015-12-11  Matthew Hanson  &lt;matthew_hanson@apple.com&gt;
+
</ins><span class="cx">         Merge r193859. rdar://problem/23814477
</span><span class="cx"> 
</span><span class="cx">     2015-12-09  David Hyatt  &lt;hyatt@apple.com&gt;
</span></span></pre></div>
<a id="branchessafari601branchSourceWebCoreplatformtextTextBreakIteratorcpp"></a>
<div class="modfile"><h4>Modified: branches/safari-601-branch/Source/WebCore/platform/text/TextBreakIterator.cpp (193966 => 193967)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-601-branch/Source/WebCore/platform/text/TextBreakIterator.cpp        2015-12-11 18:26:38 UTC (rev 193966)
+++ branches/safari-601-branch/Source/WebCore/platform/text/TextBreakIterator.cpp        2015-12-11 18:26:41 UTC (rev 193967)
</span><span class="lines">@@ -214,7 +214,7 @@
</span><span class="cx">         &quot;$EmojiVar = [\\uFE0F];&quot;            // Emoji-style variation selector
</span><span class="cx"> #if ADDITIONAL_EMOJI_SUPPORT
</span><span class="cx">         &quot;$EmojiForSeqs = [\\u2764 \\U0001F441 \\U0001F466-\\U0001F469 \\U0001F48B \\U0001F5E8];&quot; // Emoji that participate in ZWJ sequences
</span><del>-        &quot;$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] ;&quot; // Emoji that take Fitzpatrick modifiers
</del><ins>+        &quot;$EmojiForMods = [\\u261D \\u26F9 \\u270A-\\u270D \\U0001F385 \\U0001F3C3-\\U0001F3C4 \\U0001F3CA \\U0001F3CB \\U0001F442-\\U0001F443 \\U0001F446-\\U0001F450 \\U0001F466-\\U0001F469 \\U0001F46E-\\U0001F478 \\U0001F47C \\U0001F481-\\U0001F483 \\U0001F485-\\U0001F487 \\U0001F4AA \\U0001F575 \\U0001F590 \\U0001F595 \\U0001F596 \\U0001F645-\\U0001F647 \\U0001F64B-\\U0001F64F \\U0001F6A3 \\U0001F6B4-\\U0001F6B6 \\U0001F6C0 \\U0001F918] ;&quot; // Emoji that take Fitzpatrick modifiers
</ins><span class="cx"> #else
</span><span class="cx">         &quot;$EmojiForSeqs = [\\u2764 \\U0001F466-\\U0001F469 \\U0001F48B];&quot; // Emoji that participate in ZWJ sequences
</span><span class="cx">         &quot;$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] ;&quot; // Emoji that take Fitzpatrick modifiers
</span><span class="lines">@@ -447,7 +447,7 @@
</span><span class="cx">     &quot;$EmojiVar = \\uFE0F;&quot;
</span><span class="cx"> #if ADDITIONAL_EMOJI_SUPPORT
</span><span class="cx">     &quot;$EmojiForSeqs = [\\u2764 \\U0001F441 \\U0001F466-\\U0001F469 \\U0001F48B \\U0001F5E8];&quot;
</span><del>-    &quot;$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] ;&quot; // Emoji that take Fitzpatrick modifiers
</del><ins>+    &quot;$EmojiForMods = [\\u261D \\u26F9 \\u270A-\\u270D \\U0001F385 \\U0001F3C3-\\U0001F3C4 \\U0001F3CA \\U0001F3CB \\U0001F442-\\U0001F443 \\U0001F446-\\U0001F450 \\U0001F466-\\U0001F469 \\U0001F46E-\\U0001F478 \\U0001F47C \\U0001F481-\\U0001F483 \\U0001F485-\\U0001F487 \\U0001F4AA \\U0001F575 \\U0001F590 \\U0001F595 \\U0001F596 \\U0001F645-\\U0001F647 \\U0001F64B-\\U0001F64F \\U0001F6A3 \\U0001F6B4-\\U0001F6B6 \\U0001F6C0 \\U0001F918] ;&quot; // Emoji that take Fitzpatrick modifiers
</ins><span class="cx"> #else
</span><span class="cx">     &quot;$EmojiForSeqs = [\\u2764 \\U0001F466-\\U0001F469 \\U0001F48B];&quot;
</span><span class="cx">     &quot;$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] ;&quot; // Emoji that take Fitzpatrick modifiers
</span></span></pre>
</div>
</div>

</body>
</html>