gemoji 4.0.0

Add skin tones support

.github/workflows/test.yml

@@ -7,28 +7,18 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        os: [ubuntu-latest]
-        ruby: ["2.3", "2.4", "2.5", "2.6", "2.7"]
+        ruby: ["2.7", "3.0", "3.1"]
 
-    runs-on: ${{matrix.os}}
+    runs-on: ubuntu-latest
 
     steps:
-    - uses: actions/checkout@v2
+    - uses: actions/checkout@v3
     
     - name: Set up Ruby
       uses: ruby/setup-ruby@v1
       with:
         ruby-version: ${{matrix.ruby}}
-    
-    - uses: actions/cache@v2
-      with:
-        path: vendor/bundle
-        key: bundle-use-ruby-${{ matrix.os }}-${{ matrix.ruby }}-${{ hashFiles('Gemfile') }}
-        restore-keys: |
-          bundle-use-ruby-${{ matrix.os }}-${{ matrix.ruby }}-
-    
-    - name: Install dependencies
-      run: bundle install --path vendor/bundle --jobs 4
+        bundler-cache: true
     
     - name: Run tests
       run: bundle exec rake

.travis.yml

@@ -1,12 +0,0 @@
-sudo: false
-script: script/test
-rvm:
-  - 1.9.3
-  - '2.1'
-  - '2.2'
-  - '2.3'
-  - '2.4'
-  - '2.5'
-  - '2.6'
-notifications:
-  email: false

Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    gemoji (4.0.0.rc3)
+    gemoji (4.0.0)
 
 GEM
   remote: https://rubygems.org/

Rakefile

@@ -20,5 +20,5 @@ namespace :db do
 end
 
 file 'vendor/unicode-emoji-test.txt' do |t|
-  system 'curl', '-fsSL', 'http://unicode.org/Public/emoji/13.1/emoji-test.txt', '-o', t.name
+  system 'curl', '-fsSL', 'http://unicode.org/Public/emoji/14.0/emoji-test.txt', '-o', t.name
 end

db/dump.rb

@@ -38,8 +38,8 @@ for category in categories
         output_item.update(
           aliases: [I18n.transliterate(description).gsub(/\W+/, '_').downcase],
           tags: [],
-          unicode_version: "13.1",
-          ios_version: "14.5",
+          unicode_version: "14.0",
+          ios_version: "15.4",
         )
       end
       output_item[:skin_tones] = true if emoji_item[:skin_tones]

db/emoji.json

@@ -135,6 +135,20 @@
   , "unicode_version": "8.0"
   , "ios_version": "9.1"
   }
+, {
+    "emoji": "🫠"
+  , "description": "melting face"
+  , "category": "Smileys & Emotion"
+  , "aliases": [
+      "melting_face"
+    ]
+  , "tags": [
+      "sarcasm"
+    , "dread"
+    ]
+  , "unicode_version": "14.0"
+  , "ios_version": "15.4"
+  }
 , {
     "emoji": "😉"
   , "description": "winking face"
@@ -371,7 +385,7 @@
   }
 , {
     "emoji": "🤗"
-  , "description": "hugging face"
+  , "description": "smiling face with open hands"
   , "category": "Smileys & Emotion"
   , "aliases": [
       "hugs"
@@ -395,6 +409,32 @@
   , "unicode_version": "11.0"
   , "ios_version": "12.1"
   }
+, {
+    "emoji": "🫢"
+  , "description": "face with open eyes and hand over mouth"
+  , "category": "Smileys & Emotion"
+  , "aliases": [
+      "face_with_open_eyes_and_hand_over_mouth"
+    ]
+  , "tags": [
+      "gasp"
+    , "shock"
+    ]
+  , "unicode_version": "14.0"
+  , "ios_version": "15.4"
+  }
+, {
+    "emoji": "🫣"
+  , "description": "face with peeking eye"
+  , "category": "Smileys & Emotion"
+  , "aliases": [
+      "face_with_peeking_eye"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": "14.0"
+  , "ios_version": "15.4"
+  }
 , {
     "emoji": "🤫"
   , "description": "shushing face"
@@ -421,6 +461,19 @@
   , "unicode_version": "8.0"
   , "ios_version": "9.1"
   }
+, {
+    "emoji": "🫡"
+  , "description": "saluting face"
+  , "category": "Smileys & Emotion"
+  , "aliases": [
+      "saluting_face"
+    ]
+  , "tags": [
+      "respect"
+    ]
+  , "unicode_version": "14.0"
+  , "ios_version": "15.4"
+  }
 , {
     "emoji": "🤐"
   , "description": "zipper-mouth face"
@@ -487,6 +540,19 @@
   , "unicode_version": "6.0"
   , "ios_version": "6.0"
   }
+, {
+    "emoji": "🫥"
+  , "description": "dotted line face"
+  , "category": "Smileys & Emotion"
+  , "aliases": [
+      "dotted_line_face"
+    ]
+  , "tags": [
+      "invisible"
+    ]
+  , "unicode_version": "14.0"
+  , "ios_version": "15.4"
+  }
 , {
     "emoji": "😶‍🌫️"
   , "description": "face in clouds"
@@ -763,7 +829,7 @@
   }
 , {
     "emoji": "😵"
-  , "description": "knocked-out face"
+  , "description": "face with crossed-out eyes"
   , "category": "Smileys & Emotion"
   , "aliases": [
       "dizzy_face"
@@ -888,6 +954,19 @@
   , "unicode_version": "6.1"
   , "ios_version": "6.0"
   }
+, {
+    "emoji": "🫤"
+  , "description": "face with diagonal mouth"
+  , "category": "Smileys & Emotion"
+  , "aliases": [
+      "face_with_diagonal_mouth"
+    ]
+  , "tags": [
+      "confused"
+    ]
+  , "unicode_version": "14.0"
+  , "ios_version": "15.4"
+  }
 , {
     "emoji": "😟"
   , "description": "worried face"
@@ -994,6 +1073,20 @@
   , "unicode_version": "11.0"
   , "ios_version": "12.1"
   }
+, {
+    "emoji": "🥹"
+  , "description": "face holding back tears"
+  , "category": "Smileys & Emotion"
+  , "aliases": [
+      "face_holding_back_tears"
+    ]
+  , "tags": [
+      "tears"
+    , "gratitude"
+    ]
+  , "unicode_version": "14.0"
+  , "ios_version": "15.4"
+  }
 , {
     "emoji": "😦"
   , "description": "frowning face with open mouth"
@@ -2104,6 +2197,58 @@
   , "ios_version": "8.3"
   , "skin_tones": true
   }
+, {
+    "emoji": "🫱"
+  , "description": "rightwards hand"
+  , "category": "People & Body"
+  , "aliases": [
+      "rightwards_hand"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": "14.0"
+  , "ios_version": "15.4"
+  , "skin_tones": true
+  }
+, {
+    "emoji": "🫲"
+  , "description": "leftwards hand"
+  , "category": "People & Body"
+  , "aliases": [
+      "leftwards_hand"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": "14.0"
+  , "ios_version": "15.4"
+  , "skin_tones": true
+  }
+, {
+    "emoji": "🫳"
+  , "description": "palm down hand"
+  , "category": "People & Body"
+  , "aliases": [
+      "palm_down_hand"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": "14.0"
+  , "ios_version": "15.4"
+  , "skin_tones": true
+  }
+, {
+    "emoji": "🫴"
+  , "description": "palm up hand"
+  , "category": "People & Body"
+  , "aliases": [
+      "palm_up_hand"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": "14.0"
+  , "ios_version": "15.4"
+  , "skin_tones": true
+  }
 , {
     "emoji": "👌"
   , "description": "OK hand"
@@ -2173,6 +2318,19 @@
   , "ios_version": "10.2"
   , "skin_tones": true
   }
+, {
+    "emoji": "🫰"
+  , "description": "hand with index finger and thumb crossed"
+  , "category": "People & Body"
+  , "aliases": [
+      "hand_with_index_finger_and_thumb_crossed"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": "14.0"
+  , "ios_version": "15.4"
+  , "skin_tones": true
+  }
 , {
     "emoji": "🤟"
   , "description": "love-you gesture"
@@ -2291,6 +2449,19 @@
   , "ios_version": "6.0"
   , "skin_tones": true
   }
+, {
+    "emoji": "🫵"
+  , "description": "index pointing at the viewer"
+  , "category": "People & Body"
+  , "aliases": [
+      "index_pointing_at_the_viewer"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": "14.0"
+  , "ios_version": "15.4"
+  , "skin_tones": true
+  }
 , {
     "emoji": "👍"
   , "description": "thumbs up"
@@ -2409,6 +2580,20 @@
   , "ios_version": "6.0"
   , "skin_tones": true
   }
+, {
+    "emoji": "🫶"
+  , "description": "heart hands"
+  , "category": "People & Body"
+  , "aliases": [
+      "heart_hands"
+    ]
+  , "tags": [
+      "love"
+    ]
+  , "unicode_version": "14.0"
+  , "ios_version": "15.4"
+  , "skin_tones": true
+  }
 , {
     "emoji": "👐"
   , "description": "open hands"
@@ -2447,6 +2632,7 @@
     ]
   , "unicode_version": "9.0"
   , "ios_version": "10.2"
+  , "skin_tones": true
   }
 , {
     "emoji": "🙏"
@@ -2728,6 +2914,18 @@
   , "unicode_version": "6.0"
   , "ios_version": "6.0"
   }
+, {
+    "emoji": "🫦"
+  , "description": "biting lip"
+  , "category": "People & Body"
+  , "aliases": [
+      "biting_lip"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": "14.0"
+  , "ios_version": "15.4"
+  }
 , {
     "emoji": "👶"
   , "description": "baby"
@@ -4344,6 +4542,19 @@
   , "ios_version": "10.0"
   , "skin_tones": true
   }
+, {
+    "emoji": "🫅"
+  , "description": "person with crown"
+  , "category": "People & Body"
+  , "aliases": [
+      "person_with_crown"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": "14.0"
+  , "ios_version": "15.4"
+  , "skin_tones": true
+  }
 , {
     "emoji": "🤴"
   , "description": "prince"
@@ -4537,6 +4748,32 @@
   , "ios_version": "10.2"
   , "skin_tones": true
   }
+, {
+    "emoji": "🫃"
+  , "description": "pregnant man"
+  , "category": "People & Body"
+  , "aliases": [
+      "pregnant_man"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": "14.0"
+  , "ios_version": "15.4"
+  , "skin_tones": true
+  }
+, {
+    "emoji": "🫄"
+  , "description": "pregnant person"
+  , "category": "People & Body"
+  , "aliases": [
+      "pregnant_person"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": "14.0"
+  , "ios_version": "15.4"
+  , "skin_tones": true
+  }
 , {
     "emoji": "🤱"
   , "description": "breast-feeding"
@@ -4992,6 +5229,18 @@
   , "unicode_version": "11.0"
   , "ios_version": "12.1"
   }
+, {
+    "emoji": "🧌"
+  , "description": "troll"
+  , "category": "People & Body"
+  , "aliases": [
+      "troll"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": "14.0"
+  , "ios_version": "15.4"
+  }
 , {
     "emoji": "💆"
   , "description": "person getting massage"
@@ -6167,7 +6416,7 @@
     ]
   , "unicode_version": "12.0"
   , "ios_version": "13.0"
-  , "skin_tones": true
+  , "skin_tones": false
   }
 , {
     "emoji": "👭"
@@ -7927,6 +8176,18 @@
   , "unicode_version": "6.0"
   , "ios_version": "6.0"
   }
+, {
+    "emoji": "🪸"
+  , "description": "coral"
+  , "category": "Animals & Nature"
+  , "aliases": [
+      "coral"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": "14.0"
+  , "ios_version": "15.4"
+  }
 , {
     "emoji": "🐌"
   , "description": "snail"
@@ -8162,6 +8423,18 @@
   , "unicode_version": "6.0"
   , "ios_version": "6.0"
   }
+, {
+    "emoji": "🪷"
+  , "description": "lotus"
+  , "category": "Animals & Nature"
+  , "aliases": [
+      "lotus"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": "14.0"
+  , "ios_version": "15.4"
+  }
 , {
     "emoji": "🏵️"
   , "description": "rosette"
@@ -8411,6 +8684,30 @@
   , "unicode_version": "6.0"
   , "ios_version": "6.0"
   }
+, {
+    "emoji": "🪹"
+  , "description": "empty nest"
+  , "category": "Animals & Nature"
+  , "aliases": [
+      "empty_nest"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": "14.0"
+  , "ios_version": "15.4"
+  }
+, {
+    "emoji": "🪺"
+  , "description": "nest with eggs"
+  , "category": "Animals & Nature"
+  , "aliases": [
+      "nest_with_eggs"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": "14.0"
+  , "ios_version": "15.4"
+  }
 , {
     "emoji": "🍇"
   , "description": "grapes"
@@ -8815,6 +9112,18 @@
   , "unicode_version": "9.0"
   , "ios_version": "10.2"
   }
+, {
+    "emoji": "🫘"
+  , "description": "beans"
+  , "category": "Food & Drink"
+  , "aliases": [
+      "beans"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": "14.0"
+  , "ios_version": "15.4"
+  }
 , {
     "emoji": "🌰"
   , "description": "chestnut"
@@ -9864,6 +10173,18 @@
   , "unicode_version": "9.0"
   , "ios_version": "10.2"
   }
+, {
+    "emoji": "🫗"
+  , "description": "pouring liquid"
+  , "category": "Food & Drink"
+  , "aliases": [
+      "pouring_liquid"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": "14.0"
+  , "ios_version": "15.4"
+  }
 , {
     "emoji": "🥤"
   , "description": "cup with straw"
@@ -9990,6 +10311,18 @@
   , "unicode_version": "6.0"
   , "ios_version": "6.0"
   }
+, {
+    "emoji": "🫙"
+  , "description": "jar"
+  , "category": "Food & Drink"
+  , "aliases": [
+      "jar"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": "14.0"
+  , "ios_version": "15.4"
+  }
 , {
     "emoji": "🏺"
   , "description": "amphora"
@@ -10751,6 +11084,18 @@
   , "unicode_version": "6.0"
   , "ios_version": "6.0"
   }
+, {
+    "emoji": "🛝"
+  , "description": "playground slide"
+  , "category": "Travel & Places"
+  , "aliases": [
+      "playground_slide"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": "14.0"
+  , "ios_version": "15.4"
+  }
 , {
     "emoji": "🎡"
   , "description": "ferris wheel"
@@ -11332,6 +11677,18 @@
   , "unicode_version": "5.2"
   , "ios_version": "6.0"
   }
+, {
+    "emoji": "🛞"
+  , "description": "wheel"
+  , "category": "Travel & Places"
+  , "aliases": [
+      "wheel"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": "14.0"
+  , "ios_version": "15.4"
+  }
 , {
     "emoji": "🚨"
   , "description": "police car light"
@@ -11409,6 +11766,19 @@
   , "unicode_version": "4.1"
   , "ios_version": "6.0"
   }
+, {
+    "emoji": "🛟"
+  , "description": "ring buoy"
+  , "category": "Travel & Places"
+  , "aliases": [
+      "ring_buoy"
+    ]
+  , "tags": [
+      "life preserver"
+    ]
+  , "unicode_version": "14.0"
+  , "ios_version": "15.4"
+  }
 , {
     "emoji": "⛵"
   , "description": "sailboat"
@@ -13408,6 +13778,18 @@
   , "unicode_version": "11.0"
   , "ios_version": "12.1"
   }
+, {
+    "emoji": "🪬"
+  , "description": "hamsa"
+  , "category": "Activities"
+  , "aliases": [
+      "hamsa"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": "14.0"
+  , "ios_version": "15.4"
+  }
 , {
     "emoji": "🎮"
   , "description": "video game"
@@ -13497,6 +13879,20 @@
   , "unicode_version": "13.0"
   , "ios_version": "14.0"
   }
+, {
+    "emoji": "🪩"
+  , "description": "mirror ball"
+  , "category": "Activities"
+  , "aliases": [
+      "mirror_ball"
+    ]
+  , "tags": [
+      "disco"
+    , "party"
+    ]
+  , "unicode_version": "14.0"
+  , "ios_version": "15.4"
+  }
 , {
     "emoji": "🪆"
   , "description": "nesting dolls"
@@ -14695,6 +15091,18 @@
   , "unicode_version": "6.0"
   , "ios_version": "6.0"
   }
+, {
+    "emoji": "🪫"
+  , "description": "low battery"
+  , "category": "Objects"
+  , "aliases": [
+      "low_battery"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": "14.0"
+  , "ios_version": "15.4"
+  }
 , {
     "emoji": "🔌"
   , "description": "electric plug"
@@ -16442,6 +16850,18 @@
   , "unicode_version": "12.0"
   , "ios_version": "13.0"
   }
+, {
+    "emoji": "🩼"
+  , "description": "crutch"
+  , "category": "Objects"
+  , "aliases": [
+      "crutch"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": "14.0"
+  , "ios_version": "15.4"
+  }
 , {
     "emoji": "🩺"
   , "description": "stethoscope"
@@ -16454,6 +16874,18 @@
   , "unicode_version": "12.0"
   , "ios_version": "13.0"
   }
+, {
+    "emoji": "🩻"
+  , "description": "x-ray"
+  , "category": "Objects"
+  , "aliases": [
+      "x_ray"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": "14.0"
+  , "ios_version": "15.4"
+  }
 , {
     "emoji": "🚪"
   , "description": "door"
@@ -16697,6 +17129,18 @@
   , "unicode_version": "11.0"
   , "ios_version": "12.1"
   }
+, {
+    "emoji": "🫧"
+  , "description": "bubbles"
+  , "category": "Objects"
+  , "aliases": [
+      "bubbles"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": "14.0"
+  , "ios_version": "15.4"
+  }
 , {
     "emoji": "🪥"
   , "description": "toothbrush"
@@ -16820,6 +17264,18 @@
   , "unicode_version": "13.0"
   , "ios_version": "14.0"
   }
+, {
+    "emoji": "🪪"
+  , "description": "identification card"
+  , "category": "Objects"
+  , "aliases": [
+      "identification_card"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": "14.0"
+  , "ios_version": "15.4"
+  }
 , {
     "emoji": "🏧"
   , "description": "ATM sign"
@@ -18074,6 +18530,18 @@
   , "unicode_version": "6.0"
   , "ios_version": "6.0"
   }
+, {
+    "emoji": "🟰"
+  , "description": "heavy equals sign"
+  , "category": "Symbols"
+  , "aliases": [
+      "heavy_equals_sign"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": "14.0"
+  , "ios_version": "15.4"
+  }
 , {
     "emoji": "♾️"
   , "description": "infinity"

gemoji.gemspec

@@ -1,6 +1,6 @@
 Gem::Specification.new do |s|
   s.name    = "gemoji"
-  s.version = "4.0.0.rc3"
+  s.version = "4.0.0"
   s.summary = "Unicode emoji library"
   s.description = "Character information and metadata for Unicode emoji."
 

lib/emoji.rb

@@ -51,11 +51,12 @@ module Emoji
 
   # Public: Find an emoji by its unicode character. Return nil if missing.
   def find_by_unicode(unicode)
-    unicodes_index[unicode]
+    unicodes_index[unicode] || unicodes_index[unicode.sub(SKIN_TONE_RE, "")]
   end
 
   private
     VARIATION_SELECTOR_16 = "\u{fe0f}".freeze
+    SKIN_TONE_RE = /[\u{1F3FB}-\u{1F3FF}]/
 
     # Characters which must have VARIATION_SELECTOR_16 to render as color emoji:
     TEXT_GLYPHS = [
@@ -70,7 +71,7 @@ module Emoji
       "\u{3030}",  # wavy dash
     ].freeze
 
-    private_constant :VARIATION_SELECTOR_16, :TEXT_GLYPHS
+    private_constant :VARIATION_SELECTOR_16, :TEXT_GLYPHS, :SKIN_TONE_RE
 
     def parse_data_file
       data = File.open(data_file, 'r:UTF-8') do |file|
@@ -118,6 +119,7 @@ module Emoji
           emoji.description = dedup.call(raw_emoji[:description])
           emoji.unicode_version = dedup.call(raw_emoji[:unicode_version])
           emoji.ios_version = dedup.call(raw_emoji[:ios_version])
+          emoji.skin_tones = raw_emoji.fetch(:skin_tones, false)
         end
       end
     end

lib/emoji/character.rb

@@ -11,6 +11,11 @@ module Emoji
     # True if the emoji is not a standard Emoji character.
     def custom?() !raw end
 
+    # True if the emoji supports Fitzpatrick scale skin tone modifiers
+    def skin_tones?() @skin_tones end
+
+    attr_writer :skin_tones
+
     # A list of names uniquely referring to this emoji.
     attr_reader :aliases
 
@@ -38,6 +43,21 @@ module Emoji
     # Raw Unicode string for an emoji. Nil if emoji is non-standard.
     def raw() unicode_aliases.first end
 
+    # Raw Unicode strings for each skin tone variant of this emoji.
+    def raw_skin_tone_variants
+      return [] if custom? || !skin_tones?
+      raw_normalized = raw.sub("\u{fe0f}", "") # strip VARIATION_SELECTOR_16
+      idx = raw_normalized.index("\u{200d}") # detect zero-width joiner
+      SKIN_TONES.map do |modifier|
+        if idx
+          # insert modifier before zero-width joiner
+          raw_normalized[...idx] + modifier + raw_normalized[idx..]
+        else
+          raw_normalized + modifier
+        end
+      end
+    end
+
     def add_unicode_alias(str)
       unicode_aliases << str
     end
@@ -54,6 +74,7 @@ module Emoji
       @aliases = Array(name)
       @unicode_aliases = []
       @tags = []
+      @skin_tones = false
     end
 
     def inspect
@@ -76,6 +97,16 @@ module Emoji
     end
 
     private
+    
+    SKIN_TONES = [
+      "\u{1F3FB}", # light skin tone
+      "\u{1F3FC}", # medium-light skin tone
+      "\u{1F3FD}", # medium skin tone
+      "\u{1F3FE}", # medium-dark skin tone
+      "\u{1F3FF}", # dark skin tone
+    ]
+
+    private_constant :SKIN_TONES
 
     def default_image_filename
       if custom?

test/emoji_test.rb

@@ -50,13 +50,19 @@ class EmojiTest < TestCase
   GENDER_EXCEPTIONS = [
     "man_with_gua_pi_mao",
     "woman_with_headscarf",
-    "pregnant_woman",
     "isle_of_man",
-    "blonde_woman",
+    "blonde_woman", # blond_haired_man
     /^couple(kiss)?_/,
     /^family_/,
   ]
 
+  DASH_EXCEPTIONS = [
+    "-1",
+    "t-rex",
+    "e-mail",
+    "non-potable_water",
+  ]
+
   test "emojis have valid names" do
     aliases = Emoji.all.flat_map(&:aliases)
 
@@ -75,7 +81,7 @@ class EmojiTest < TestCase
     alias_count = Hash.new(0)
     aliases.each do |name|
       alias_count[name] += 1
-      invalid << name if name !~ /\A[\w+-]+\Z/
+      invalid << name if name !~ /\A[\w+]+\Z/ && !DASH_EXCEPTIONS.include?(name)
       another_gender = to_another_gender.call(name)
       gender_mismatch << another_gender unless aliases.include?(another_gender)
     end
@@ -90,7 +96,6 @@ class EmojiTest < TestCase
   test "missing or incorrect unicodes" do
     emoji_map, _ = EmojiTestParser.parse(File.expand_path("../../vendor/unicode-emoji-test.txt", __FILE__))
     source_unicode_emoji = emoji_map.values
-    supported_sequences = Emoji.all.flat_map(&:unicode_aliases)
     text_glyphs = Emoji.const_get(:TEXT_GLYPHS)
 
     missing = 0
@@ -152,6 +157,27 @@ class EmojiTest < TestCase
     assert_equal '8.3', emoji.ios_version
   end
 
+  test "skin tones" do
+    smiley = Emoji.find_by_alias("smiley")
+    assert_equal false, smiley.skin_tones?
+    assert_equal [], smiley.raw_skin_tone_variants
+
+    wave = Emoji.find_by_alias("wave")
+    assert_equal true, wave.skin_tones?
+
+    wave = Emoji.find_by_unicode("\u{1f44b}\u{1f3ff}") # wave + dark skin tone
+    assert_equal "wave", wave.name
+
+    woman_with_beard = Emoji.find_by_unicode("\u{1f9d4}\u{200d}\u{2640}\u{fe0f}")
+    assert_equal [
+      "1f9d4-1f3fb-200d-2640",
+      "1f9d4-1f3fc-200d-2640",
+      "1f9d4-1f3fd-200d-2640",
+      "1f9d4-1f3fe-200d-2640",
+      "1f9d4-1f3ff-200d-2640",
+    ], woman_with_beard.raw_skin_tone_variants.map { |u| Emoji::Character.hex_inspect(u) }
+  end
+
   test "no custom emojis" do
     custom = Emoji.all.select(&:custom?)
     assert 0, custom.size

vendor/unicode-emoji-test.txt

@@ -1,11 +1,11 @@
 # emoji-test.txt
-# Date: 2020-09-12, 22:19:50 GMT
-# © 2020 Unicode®, Inc.
+# Date: 2021-08-26, 17:22:23 GMT
+# © 2021 Unicode®, Inc.
 # Unicode and the Unicode Logo are registered trademarks of Unicode, Inc. in the U.S. and other countries.
 # For terms of use, see http://www.unicode.org/terms_of_use.html
 #
 # Emoji Keyboard/Display Test Data for UTS #51
-# Version: 13.1
+# Version: 14.0
 #
 # For documentation and usage, see http://www.unicode.org/reports/tr51
 #
@@ -43,6 +43,7 @@
 1F602                                                  ; fully-qualified     # 😂 E0.6 face with tears of joy
 1F642                                                  ; fully-qualified     # 🙂 E1.0 slightly smiling face
 1F643                                                  ; fully-qualified     # 🙃 E1.0 upside-down face
+1FAE0                                                  ; fully-qualified     # 🫠 E14.0 melting face
 1F609                                                  ; fully-qualified     # 😉 E0.6 winking face
 1F60A                                                  ; fully-qualified     # 😊 E0.6 smiling face with smiling eyes
 1F607                                                  ; fully-qualified     # 😇 E1.0 smiling face with halo
@@ -68,10 +69,13 @@
 1F911                                                  ; fully-qualified     # 🤑 E1.0 money-mouth face
 
 # subgroup: face-hand
-1F917                                                  ; fully-qualified     # 🤗 E1.0 hugging face
+1F917                                                  ; fully-qualified     # 🤗 E1.0 smiling face with open hands
 1F92D                                                  ; fully-qualified     # 🤭 E5.0 face with hand over mouth
+1FAE2                                                  ; fully-qualified     # 🫢 E14.0 face with open eyes and hand over mouth
+1FAE3                                                  ; fully-qualified     # 🫣 E14.0 face with peeking eye
 1F92B                                                  ; fully-qualified     # 🤫 E5.0 shushing face
 1F914                                                  ; fully-qualified     # 🤔 E1.0 thinking face
+1FAE1                                                  ; fully-qualified     # 🫡 E14.0 saluting face
 
 # subgroup: face-neutral-skeptical
 1F910                                                  ; fully-qualified     # 🤐 E1.0 zipper-mouth face
@@ -79,6 +83,7 @@
 1F610                                                  ; fully-qualified     # 😐 E0.7 neutral face
 1F611                                                  ; fully-qualified     # 😑 E1.0 expressionless face
 1F636                                                  ; fully-qualified     # 😶 E1.0 face without mouth
+1FAE5                                                  ; fully-qualified     # 🫥 E14.0 dotted line face
 1F636 200D 1F32B FE0F                                  ; fully-qualified     # 😶‍🌫️ E13.1 face in clouds
 1F636 200D 1F32B                                       ; minimally-qualified # 😶‍🌫 E13.1 face in clouds
 1F60F                                                  ; fully-qualified     # 😏 E0.6 smirking face
@@ -105,7 +110,7 @@
 1F975                                                  ; fully-qualified     # 🥵 E11.0 hot face
 1F976                                                  ; fully-qualified     # 🥶 E11.0 cold face
 1F974                                                  ; fully-qualified     # 🥴 E11.0 woozy face
-1F635                                                  ; fully-qualified     # 😵 E0.6 knocked-out face
+1F635                                                  ; fully-qualified     # 😵 E0.6 face with crossed-out eyes
 1F635 200D 1F4AB                                       ; fully-qualified     # 😵‍💫 E13.1 face with spiral eyes
 1F92F                                                  ; fully-qualified     # 🤯 E5.0 exploding head
 
@@ -121,6 +126,7 @@
 
 # subgroup: face-concerned
 1F615                                                  ; fully-qualified     # 😕 E1.0 confused face
+1FAE4                                                  ; fully-qualified     # 🫤 E14.0 face with diagonal mouth
 1F61F                                                  ; fully-qualified     # 😟 E1.0 worried face
 1F641                                                  ; fully-qualified     # 🙁 E1.0 slightly frowning face
 2639 FE0F                                              ; fully-qualified     # ☹️ E0.7 frowning face
@@ -130,6 +136,7 @@
 1F632                                                  ; fully-qualified     # 😲 E0.6 astonished face
 1F633                                                  ; fully-qualified     # 😳 E0.6 flushed face
 1F97A                                                  ; fully-qualified     # 🥺 E11.0 pleading face
+1F979                                                  ; fully-qualified     # 🥹 E14.0 face holding back tears
 1F626                                                  ; fully-qualified     # 😦 E1.0 frowning face with open mouth
 1F627                                                  ; fully-qualified     # 😧 E1.0 anguished face
 1F628                                                  ; fully-qualified     # 😨 E0.6 fearful face
@@ -232,8 +239,8 @@
 1F4AD                                                  ; fully-qualified     # 💭 E1.0 thought balloon
 1F4A4                                                  ; fully-qualified     # 💤 E0.6 zzz
 
-# Smileys & Emotion subtotal:		170
-# Smileys & Emotion subtotal:		170	w/o modifiers
+# Smileys & Emotion subtotal:		177
+# Smileys & Emotion subtotal:		177	w/o modifiers
 
 # group: People & Body
 
@@ -269,6 +276,30 @@
 1F596 1F3FD                                            ; fully-qualified     # 🖖🏽 E1.0 vulcan salute: medium skin tone
 1F596 1F3FE                                            ; fully-qualified     # 🖖🏾 E1.0 vulcan salute: medium-dark skin tone
 1F596 1F3FF                                            ; fully-qualified     # 🖖🏿 E1.0 vulcan salute: dark skin tone
+1FAF1                                                  ; fully-qualified     # 🫱 E14.0 rightwards hand
+1FAF1 1F3FB                                            ; fully-qualified     # 🫱🏻 E14.0 rightwards hand: light skin tone
+1FAF1 1F3FC                                            ; fully-qualified     # 🫱🏼 E14.0 rightwards hand: medium-light skin tone
+1FAF1 1F3FD                                            ; fully-qualified     # 🫱🏽 E14.0 rightwards hand: medium skin tone
+1FAF1 1F3FE                                            ; fully-qualified     # 🫱🏾 E14.0 rightwards hand: medium-dark skin tone
+1FAF1 1F3FF                                            ; fully-qualified     # 🫱🏿 E14.0 rightwards hand: dark skin tone
+1FAF2                                                  ; fully-qualified     # 🫲 E14.0 leftwards hand
+1FAF2 1F3FB                                            ; fully-qualified     # 🫲🏻 E14.0 leftwards hand: light skin tone
+1FAF2 1F3FC                                            ; fully-qualified     # 🫲🏼 E14.0 leftwards hand: medium-light skin tone
+1FAF2 1F3FD                                            ; fully-qualified     # 🫲🏽 E14.0 leftwards hand: medium skin tone
+1FAF2 1F3FE                                            ; fully-qualified     # 🫲🏾 E14.0 leftwards hand: medium-dark skin tone
+1FAF2 1F3FF                                            ; fully-qualified     # 🫲🏿 E14.0 leftwards hand: dark skin tone
+1FAF3                                                  ; fully-qualified     # 🫳 E14.0 palm down hand
+1FAF3 1F3FB                                            ; fully-qualified     # 🫳🏻 E14.0 palm down hand: light skin tone
+1FAF3 1F3FC                                            ; fully-qualified     # 🫳🏼 E14.0 palm down hand: medium-light skin tone
+1FAF3 1F3FD                                            ; fully-qualified     # 🫳🏽 E14.0 palm down hand: medium skin tone
+1FAF3 1F3FE                                            ; fully-qualified     # 🫳🏾 E14.0 palm down hand: medium-dark skin tone
+1FAF3 1F3FF                                            ; fully-qualified     # 🫳🏿 E14.0 palm down hand: dark skin tone
+1FAF4                                                  ; fully-qualified     # 🫴 E14.0 palm up hand
+1FAF4 1F3FB                                            ; fully-qualified     # 🫴🏻 E14.0 palm up hand: light skin tone
+1FAF4 1F3FC                                            ; fully-qualified     # 🫴🏼 E14.0 palm up hand: medium-light skin tone
+1FAF4 1F3FD                                            ; fully-qualified     # 🫴🏽 E14.0 palm up hand: medium skin tone
+1FAF4 1F3FE                                            ; fully-qualified     # 🫴🏾 E14.0 palm up hand: medium-dark skin tone
+1FAF4 1F3FF                                            ; fully-qualified     # 🫴🏿 E14.0 palm up hand: dark skin tone
 
 # subgroup: hand-fingers-partial
 1F44C                                                  ; fully-qualified     # 👌 E0.6 OK hand
@@ -302,6 +333,12 @@
 1F91E 1F3FD                                            ; fully-qualified     # 🤞🏽 E3.0 crossed fingers: medium skin tone
 1F91E 1F3FE                                            ; fully-qualified     # 🤞🏾 E3.0 crossed fingers: medium-dark skin tone
 1F91E 1F3FF                                            ; fully-qualified     # 🤞🏿 E3.0 crossed fingers: dark skin tone
+1FAF0                                                  ; fully-qualified     # 🫰 E14.0 hand with index finger and thumb crossed
+1FAF0 1F3FB                                            ; fully-qualified     # 🫰🏻 E14.0 hand with index finger and thumb crossed: light skin tone
+1FAF0 1F3FC                                            ; fully-qualified     # 🫰🏼 E14.0 hand with index finger and thumb crossed: medium-light skin tone
+1FAF0 1F3FD                                            ; fully-qualified     # 🫰🏽 E14.0 hand with index finger and thumb crossed: medium skin tone
+1FAF0 1F3FE                                            ; fully-qualified     # 🫰🏾 E14.0 hand with index finger and thumb crossed: medium-dark skin tone
+1FAF0 1F3FF                                            ; fully-qualified     # 🫰🏿 E14.0 hand with index finger and thumb crossed: dark skin tone
 1F91F                                                  ; fully-qualified     # 🤟 E5.0 love-you gesture
 1F91F 1F3FB                                            ; fully-qualified     # 🤟🏻 E5.0 love-you gesture: light skin tone
 1F91F 1F3FC                                            ; fully-qualified     # 🤟🏼 E5.0 love-you gesture: medium-light skin tone
@@ -359,6 +396,12 @@
 261D 1F3FD                                             ; fully-qualified     # ☝🏽 E1.0 index pointing up: medium skin tone
 261D 1F3FE                                             ; fully-qualified     # ☝🏾 E1.0 index pointing up: medium-dark skin tone
 261D 1F3FF                                             ; fully-qualified     # ☝🏿 E1.0 index pointing up: dark skin tone
+1FAF5                                                  ; fully-qualified     # 🫵 E14.0 index pointing at the viewer
+1FAF5 1F3FB                                            ; fully-qualified     # 🫵🏻 E14.0 index pointing at the viewer: light skin tone
+1FAF5 1F3FC                                            ; fully-qualified     # 🫵🏼 E14.0 index pointing at the viewer: medium-light skin tone
+1FAF5 1F3FD                                            ; fully-qualified     # 🫵🏽 E14.0 index pointing at the viewer: medium skin tone
+1FAF5 1F3FE                                            ; fully-qualified     # 🫵🏾 E14.0 index pointing at the viewer: medium-dark skin tone
+1FAF5 1F3FF                                            ; fully-qualified     # 🫵🏿 E14.0 index pointing at the viewer: dark skin tone
 
 # subgroup: hand-fingers-closed
 1F44D                                                  ; fully-qualified     # 👍 E0.6 thumbs up
@@ -411,6 +454,12 @@
 1F64C 1F3FD                                            ; fully-qualified     # 🙌🏽 E1.0 raising hands: medium skin tone
 1F64C 1F3FE                                            ; fully-qualified     # 🙌🏾 E1.0 raising hands: medium-dark skin tone
 1F64C 1F3FF                                            ; fully-qualified     # 🙌🏿 E1.0 raising hands: dark skin tone
+1FAF6                                                  ; fully-qualified     # 🫶 E14.0 heart hands
+1FAF6 1F3FB                                            ; fully-qualified     # 🫶🏻 E14.0 heart hands: light skin tone
+1FAF6 1F3FC                                            ; fully-qualified     # 🫶🏼 E14.0 heart hands: medium-light skin tone
+1FAF6 1F3FD                                            ; fully-qualified     # 🫶🏽 E14.0 heart hands: medium skin tone
+1FAF6 1F3FE                                            ; fully-qualified     # 🫶🏾 E14.0 heart hands: medium-dark skin tone
+1FAF6 1F3FF                                            ; fully-qualified     # 🫶🏿 E14.0 heart hands: dark skin tone
 1F450                                                  ; fully-qualified     # 👐 E0.6 open hands
 1F450 1F3FB                                            ; fully-qualified     # 👐🏻 E1.0 open hands: light skin tone
 1F450 1F3FC                                            ; fully-qualified     # 👐🏼 E1.0 open hands: medium-light skin tone
@@ -424,6 +473,31 @@
 1F932 1F3FE                                            ; fully-qualified     # 🤲🏾 E5.0 palms up together: medium-dark skin tone
 1F932 1F3FF                                            ; fully-qualified     # 🤲🏿 E5.0 palms up together: dark skin tone
 1F91D                                                  ; fully-qualified     # 🤝 E3.0 handshake
+1F91D 1F3FB                                            ; fully-qualified     # 🤝🏻 E3.0 handshake: light skin tone
+1F91D 1F3FC                                            ; fully-qualified     # 🤝🏼 E3.0 handshake: medium-light skin tone
+1F91D 1F3FD                                            ; fully-qualified     # 🤝🏽 E3.0 handshake: medium skin tone
+1F91D 1F3FE                                            ; fully-qualified     # 🤝🏾 E3.0 handshake: medium-dark skin tone
+1F91D 1F3FF                                            ; fully-qualified     # 🤝🏿 E3.0 handshake: dark skin tone
+1FAF1 1F3FB 200D 1FAF2 1F3FC                           ; fully-qualified     # 🫱🏻‍🫲🏼 E14.0 handshake: light skin tone, medium-light skin tone
+1FAF1 1F3FB 200D 1FAF2 1F3FD                           ; fully-qualified     # 🫱🏻‍🫲🏽 E14.0 handshake: light skin tone, medium skin tone
+1FAF1 1F3FB 200D 1FAF2 1F3FE                           ; fully-qualified     # 🫱🏻‍🫲🏾 E14.0 handshake: light skin tone, medium-dark skin tone
+1FAF1 1F3FB 200D 1FAF2 1F3FF                           ; fully-qualified     # 🫱🏻‍🫲🏿 E14.0 handshake: light skin tone, dark skin tone
+1FAF1 1F3FC 200D 1FAF2 1F3FB                           ; fully-qualified     # 🫱🏼‍🫲🏻 E14.0 handshake: medium-light skin tone, light skin tone
+1FAF1 1F3FC 200D 1FAF2 1F3FD                           ; fully-qualified     # 🫱🏼‍🫲🏽 E14.0 handshake: medium-light skin tone, medium skin tone
+1FAF1 1F3FC 200D 1FAF2 1F3FE                           ; fully-qualified     # 🫱🏼‍🫲🏾 E14.0 handshake: medium-light skin tone, medium-dark skin tone
+1FAF1 1F3FC 200D 1FAF2 1F3FF                           ; fully-qualified     # 🫱🏼‍🫲🏿 E14.0 handshake: medium-light skin tone, dark skin tone
+1FAF1 1F3FD 200D 1FAF2 1F3FB                           ; fully-qualified     # 🫱🏽‍🫲🏻 E14.0 handshake: medium skin tone, light skin tone
+1FAF1 1F3FD 200D 1FAF2 1F3FC                           ; fully-qualified     # 🫱🏽‍🫲🏼 E14.0 handshake: medium skin tone, medium-light skin tone
+1FAF1 1F3FD 200D 1FAF2 1F3FE                           ; fully-qualified     # 🫱🏽‍🫲🏾 E14.0 handshake: medium skin tone, medium-dark skin tone
+1FAF1 1F3FD 200D 1FAF2 1F3FF                           ; fully-qualified     # 🫱🏽‍🫲🏿 E14.0 handshake: medium skin tone, dark skin tone
+1FAF1 1F3FE 200D 1FAF2 1F3FB                           ; fully-qualified     # 🫱🏾‍🫲🏻 E14.0 handshake: medium-dark skin tone, light skin tone
+1FAF1 1F3FE 200D 1FAF2 1F3FC                           ; fully-qualified     # 🫱🏾‍🫲🏼 E14.0 handshake: medium-dark skin tone, medium-light skin tone
+1FAF1 1F3FE 200D 1FAF2 1F3FD                           ; fully-qualified     # 🫱🏾‍🫲🏽 E14.0 handshake: medium-dark skin tone, medium skin tone
+1FAF1 1F3FE 200D 1FAF2 1F3FF                           ; fully-qualified     # 🫱🏾‍🫲🏿 E14.0 handshake: medium-dark skin tone, dark skin tone
+1FAF1 1F3FF 200D 1FAF2 1F3FB                           ; fully-qualified     # 🫱🏿‍🫲🏻 E14.0 handshake: dark skin tone, light skin tone
+1FAF1 1F3FF 200D 1FAF2 1F3FC                           ; fully-qualified     # 🫱🏿‍🫲🏼 E14.0 handshake: dark skin tone, medium-light skin tone
+1FAF1 1F3FF 200D 1FAF2 1F3FD                           ; fully-qualified     # 🫱🏿‍🫲🏽 E14.0 handshake: dark skin tone, medium skin tone
+1FAF1 1F3FF 200D 1FAF2 1F3FE                           ; fully-qualified     # 🫱🏿‍🫲🏾 E14.0 handshake: dark skin tone, medium-dark skin tone
 1F64F                                                  ; fully-qualified     # 🙏 E0.6 folded hands
 1F64F 1F3FB                                            ; fully-qualified     # 🙏🏻 E1.0 folded hands: light skin tone
 1F64F 1F3FC                                            ; fully-qualified     # 🙏🏼 E1.0 folded hands: medium-light skin tone
@@ -501,6 +575,7 @@
 1F441                                                  ; unqualified         # 👁 E0.7 eye
 1F445                                                  ; fully-qualified     # 👅 E0.6 tongue
 1F444                                                  ; fully-qualified     # 👄 E0.6 mouth
+1FAE6                                                  ; fully-qualified     # 🫦 E14.0 biting lip
 
 # subgroup: person
 1F476                                                  ; fully-qualified     # 👶 E0.6 baby
@@ -1472,6 +1547,12 @@
 1F477 1F3FE 200D 2640                                  ; minimally-qualified # 👷🏾‍♀ E4.0 woman construction worker: medium-dark skin tone
 1F477 1F3FF 200D 2640 FE0F                             ; fully-qualified     # 👷🏿‍♀️ E4.0 woman construction worker: dark skin tone
 1F477 1F3FF 200D 2640                                  ; minimally-qualified # 👷🏿‍♀ E4.0 woman construction worker: dark skin tone
+1FAC5                                                  ; fully-qualified     # 🫅 E14.0 person with crown
+1FAC5 1F3FB                                            ; fully-qualified     # 🫅🏻 E14.0 person with crown: light skin tone
+1FAC5 1F3FC                                            ; fully-qualified     # 🫅🏼 E14.0 person with crown: medium-light skin tone
+1FAC5 1F3FD                                            ; fully-qualified     # 🫅🏽 E14.0 person with crown: medium skin tone
+1FAC5 1F3FE                                            ; fully-qualified     # 🫅🏾 E14.0 person with crown: medium-dark skin tone
+1FAC5 1F3FF                                            ; fully-qualified     # 🫅🏿 E14.0 person with crown: dark skin tone
 1F934                                                  ; fully-qualified     # 🤴 E3.0 prince
 1F934 1F3FB                                            ; fully-qualified     # 🤴🏻 E3.0 prince: light skin tone
 1F934 1F3FC                                            ; fully-qualified     # 🤴🏼 E3.0 prince: medium-light skin tone
@@ -1592,6 +1673,18 @@
 1F930 1F3FD                                            ; fully-qualified     # 🤰🏽 E3.0 pregnant woman: medium skin tone
 1F930 1F3FE                                            ; fully-qualified     # 🤰🏾 E3.0 pregnant woman: medium-dark skin tone
 1F930 1F3FF                                            ; fully-qualified     # 🤰🏿 E3.0 pregnant woman: dark skin tone
+1FAC3                                                  ; fully-qualified     # 🫃 E14.0 pregnant man
+1FAC3 1F3FB                                            ; fully-qualified     # 🫃🏻 E14.0 pregnant man: light skin tone
+1FAC3 1F3FC                                            ; fully-qualified     # 🫃🏼 E14.0 pregnant man: medium-light skin tone
+1FAC3 1F3FD                                            ; fully-qualified     # 🫃🏽 E14.0 pregnant man: medium skin tone
+1FAC3 1F3FE                                            ; fully-qualified     # 🫃🏾 E14.0 pregnant man: medium-dark skin tone
+1FAC3 1F3FF                                            ; fully-qualified     # 🫃🏿 E14.0 pregnant man: dark skin tone
+1FAC4                                                  ; fully-qualified     # 🫄 E14.0 pregnant person
+1FAC4 1F3FB                                            ; fully-qualified     # 🫄🏻 E14.0 pregnant person: light skin tone
+1FAC4 1F3FC                                            ; fully-qualified     # 🫄🏼 E14.0 pregnant person: medium-light skin tone
+1FAC4 1F3FD                                            ; fully-qualified     # 🫄🏽 E14.0 pregnant person: medium skin tone
+1FAC4 1F3FE                                            ; fully-qualified     # 🫄🏾 E14.0 pregnant person: medium-dark skin tone
+1FAC4 1F3FF                                            ; fully-qualified     # 🫄🏿 E14.0 pregnant person: dark skin tone
 1F931                                                  ; fully-qualified     # 🤱 E5.0 breast-feeding
 1F931 1F3FB                                            ; fully-qualified     # 🤱🏻 E5.0 breast-feeding: light skin tone
 1F931 1F3FC                                            ; fully-qualified     # 🤱🏼 E5.0 breast-feeding: medium-light skin tone
@@ -1862,6 +1955,7 @@
 1F9DF 200D 2642                                        ; minimally-qualified # 🧟‍♂ E5.0 man zombie
 1F9DF 200D 2640 FE0F                                   ; fully-qualified     # 🧟‍♀️ E5.0 woman zombie
 1F9DF 200D 2640                                        ; minimally-qualified # 🧟‍♀ E5.0 woman zombie
+1F9CC                                                  ; fully-qualified     # 🧌 E14.0 troll
 
 # subgroup: person-activity
 1F486                                                  ; fully-qualified     # 💆 E0.6 person getting massage
@@ -3168,8 +3262,8 @@
 1FAC2                                                  ; fully-qualified     # 🫂 E13.0 people hugging
 1F463                                                  ; fully-qualified     # 👣 E0.6 footprints
 
-# People & Body subtotal:		2899
-# People & Body subtotal:		494	w/o modifiers
+# People & Body subtotal:		2986
+# People & Body subtotal:		506	w/o modifiers
 
 # group: Component
 
@@ -3304,6 +3398,7 @@
 1F988                                                  ; fully-qualified     # 🦈 E3.0 shark
 1F419                                                  ; fully-qualified     # 🐙 E0.6 octopus
 1F41A                                                  ; fully-qualified     # 🐚 E0.6 spiral shell
+1FAB8                                                  ; fully-qualified     # 🪸 E14.0 coral
 
 # subgroup: animal-bug
 1F40C                                                  ; fully-qualified     # 🐌 E0.6 snail
@@ -3329,6 +3424,7 @@
 1F490                                                  ; fully-qualified     # 💐 E0.6 bouquet
 1F338                                                  ; fully-qualified     # 🌸 E0.6 cherry blossom
 1F4AE                                                  ; fully-qualified     # 💮 E0.6 white flower
+1FAB7                                                  ; fully-qualified     # 🪷 E14.0 lotus
 1F3F5 FE0F                                             ; fully-qualified     # 🏵️ E0.7 rosette
 1F3F5                                                  ; unqualified         # 🏵 E0.7 rosette
 1F339                                                  ; fully-qualified     # 🌹 E0.6 rose
@@ -3353,9 +3449,11 @@
 1F341                                                  ; fully-qualified     # 🍁 E0.6 maple leaf
 1F342                                                  ; fully-qualified     # 🍂 E0.6 fallen leaf
 1F343                                                  ; fully-qualified     # 🍃 E0.6 leaf fluttering in wind
+1FAB9                                                  ; fully-qualified     # 🪹 E14.0 empty nest
+1FABA                                                  ; fully-qualified     # 🪺 E14.0 nest with eggs
 
-# Animals & Nature subtotal:		147
-# Animals & Nature subtotal:		147	w/o modifiers
+# Animals & Nature subtotal:		151
+# Animals & Nature subtotal:		151	w/o modifiers
 
 # group: Food & Drink
 
@@ -3396,6 +3494,7 @@
 1F9C5                                                  ; fully-qualified     # 🧅 E12.0 onion
 1F344                                                  ; fully-qualified     # 🍄 E0.6 mushroom
 1F95C                                                  ; fully-qualified     # 🥜 E3.0 peanuts
+1FAD8                                                  ; fully-qualified     # 🫘 E14.0 beans
 1F330                                                  ; fully-qualified     # 🌰 E0.6 chestnut
 
 # subgroup: food-prepared
@@ -3491,6 +3590,7 @@
 1F37B                                                  ; fully-qualified     # 🍻 E0.6 clinking beer mugs
 1F942                                                  ; fully-qualified     # 🥂 E3.0 clinking glasses
 1F943                                                  ; fully-qualified     # 🥃 E3.0 tumbler glass
+1FAD7                                                  ; fully-qualified     # 🫗 E14.0 pouring liquid
 1F964                                                  ; fully-qualified     # 🥤 E5.0 cup with straw
 1F9CB                                                  ; fully-qualified     # 🧋 E13.0 bubble tea
 1F9C3                                                  ; fully-qualified     # 🧃 E12.0 beverage box
@@ -3504,10 +3604,11 @@
 1F374                                                  ; fully-qualified     # 🍴 E0.6 fork and knife
 1F944                                                  ; fully-qualified     # 🥄 E3.0 spoon
 1F52A                                                  ; fully-qualified     # 🔪 E0.6 kitchen knife
+1FAD9                                                  ; fully-qualified     # 🫙 E14.0 jar
 1F3FA                                                  ; fully-qualified     # 🏺 E1.0 amphora
 
-# Food & Drink subtotal:		131
-# Food & Drink subtotal:		131	w/o modifiers
+# Food & Drink subtotal:		134
+# Food & Drink subtotal:		134	w/o modifiers
 
 # group: Travel & Places
 
@@ -3597,6 +3698,7 @@
 2668 FE0F                                              ; fully-qualified     # ♨️ E0.6 hot springs
 2668                                                   ; unqualified         # ♨ E0.6 hot springs
 1F3A0                                                  ; fully-qualified     # 🎠 E0.6 carousel horse
+1F6DD                                                  ; fully-qualified     # 🛝 E14.0 playground slide
 1F3A1                                                  ; fully-qualified     # 🎡 E0.6 ferris wheel
 1F3A2                                                  ; fully-qualified     # 🎢 E0.6 roller coaster
 1F488                                                  ; fully-qualified     # 💈 E0.6 barber pole
@@ -3652,6 +3754,7 @@
 1F6E2 FE0F                                             ; fully-qualified     # 🛢️ E0.7 oil drum
 1F6E2                                                  ; unqualified         # 🛢 E0.7 oil drum
 26FD                                                   ; fully-qualified     # ⛽ E0.6 fuel pump
+1F6DE                                                  ; fully-qualified     # 🛞 E14.0 wheel
 1F6A8                                                  ; fully-qualified     # 🚨 E0.6 police car light
 1F6A5                                                  ; fully-qualified     # 🚥 E0.6 horizontal traffic light
 1F6A6                                                  ; fully-qualified     # 🚦 E1.0 vertical traffic light
@@ -3660,6 +3763,7 @@
 
 # subgroup: transport-water
 2693                                                   ; fully-qualified     # ⚓ E0.6 anchor
+1F6DF                                                  ; fully-qualified     # 🛟 E14.0 ring buoy
 26F5                                                   ; fully-qualified     # ⛵ E0.6 sailboat
 1F6F6                                                  ; fully-qualified     # 🛶 E3.0 canoe
 1F6A4                                                  ; fully-qualified     # 🚤 E0.6 speedboat
@@ -3797,8 +3901,8 @@
 1F4A7                                                  ; fully-qualified     # 💧 E0.6 droplet
 1F30A                                                  ; fully-qualified     # 🌊 E0.6 water wave
 
-# Travel & Places subtotal:		264
-# Travel & Places subtotal:		264	w/o modifiers
+# Travel & Places subtotal:		267
+# Travel & Places subtotal:		267	w/o modifiers
 
 # group: Activities
 
@@ -3874,6 +3978,7 @@
 1F52E                                                  ; fully-qualified     # 🔮 E0.6 crystal ball
 1FA84                                                  ; fully-qualified     # 🪄 E13.0 magic wand
 1F9FF                                                  ; fully-qualified     # 🧿 E11.0 nazar amulet
+1FAAC                                                  ; fully-qualified     # 🪬 E14.0 hamsa
 1F3AE                                                  ; fully-qualified     # 🎮 E0.6 video game
 1F579 FE0F                                             ; fully-qualified     # 🕹️ E0.7 joystick
 1F579                                                  ; unqualified         # 🕹 E0.7 joystick
@@ -3882,6 +3987,7 @@
 1F9E9                                                  ; fully-qualified     # 🧩 E11.0 puzzle piece
 1F9F8                                                  ; fully-qualified     # 🧸 E11.0 teddy bear
 1FA85                                                  ; fully-qualified     # 🪅 E13.0 piñata
+1FAA9                                                  ; fully-qualified     # 🪩 E14.0 mirror ball
 1FA86                                                  ; fully-qualified     # 🪆 E13.0 nesting dolls
 2660 FE0F                                              ; fully-qualified     # ♠️ E0.6 spade suit
 2660                                                   ; unqualified         # ♠ E0.6 spade suit
@@ -3907,8 +4013,8 @@
 1F9F6                                                  ; fully-qualified     # 🧶 E11.0 yarn
 1FAA2                                                  ; fully-qualified     # 🪢 E13.0 knot
 
-# Activities subtotal:		95
-# Activities subtotal:		95	w/o modifiers
+# Activities subtotal:		97
+# Activities subtotal:		97	w/o modifiers
 
 # group: Objects
 
@@ -4009,6 +4115,7 @@
 
 # subgroup: computer
 1F50B                                                  ; fully-qualified     # 🔋 E0.6 battery
+1FAAB                                                  ; fully-qualified     # 🪫 E14.0 low battery
 1F50C                                                  ; fully-qualified     # 🔌 E0.6 electric plug
 1F4BB                                                  ; fully-qualified     # 💻 E0.6 laptop
 1F5A5 FE0F                                             ; fully-qualified     # 🖥️ E0.7 desktop computer
@@ -4207,7 +4314,9 @@
 1FA78                                                  ; fully-qualified     # 🩸 E12.0 drop of blood
 1F48A                                                  ; fully-qualified     # 💊 E0.6 pill
 1FA79                                                  ; fully-qualified     # 🩹 E12.0 adhesive bandage
+1FA7C                                                  ; fully-qualified     # 🩼 E14.0 crutch
 1FA7A                                                  ; fully-qualified     # 🩺 E12.0 stethoscope
+1FA7B                                                  ; fully-qualified     # 🩻 E14.0 x-ray
 
 # subgroup: household
 1F6AA                                                  ; fully-qualified     # 🚪 E0.6 door
@@ -4232,6 +4341,7 @@
 1F9FB                                                  ; fully-qualified     # 🧻 E11.0 roll of paper
 1FAA3                                                  ; fully-qualified     # 🪣 E13.0 bucket
 1F9FC                                                  ; fully-qualified     # 🧼 E11.0 soap
+1FAE7                                                  ; fully-qualified     # 🫧 E14.0 bubbles
 1FAA5                                                  ; fully-qualified     # 🪥 E13.0 toothbrush
 1F9FD                                                  ; fully-qualified     # 🧽 E11.0 sponge
 1F9EF                                                  ; fully-qualified     # 🧯 E11.0 fire extinguisher
@@ -4246,9 +4356,10 @@
 26B1                                                   ; unqualified         # ⚱ E1.0 funeral urn
 1F5FF                                                  ; fully-qualified     # 🗿 E0.6 moai
 1FAA7                                                  ; fully-qualified     # 🪧 E13.0 placard
+1FAAA                                                  ; fully-qualified     # 🪪 E14.0 identification card
 
-# Objects subtotal:		299
-# Objects subtotal:		299	w/o modifiers
+# Objects subtotal:		304
+# Objects subtotal:		304	w/o modifiers
 
 # group: Symbols
 
@@ -4409,6 +4520,7 @@
 2795                                                   ; fully-qualified     # ➕ E0.6 plus
 2796                                                   ; fully-qualified     # ➖ E0.6 minus
 2797                                                   ; fully-qualified     # ➗ E0.6 divide
+1F7F0                                                  ; fully-qualified     # 🟰 E14.0 heavy equals sign
 267E FE0F                                              ; fully-qualified     # ♾️ E11.0 infinity
 267E                                                   ; unqualified         # ♾ E11.0 infinity
 
@@ -4581,8 +4693,8 @@
 1F533                                                  ; fully-qualified     # 🔳 E0.6 white square button
 1F532                                                  ; fully-qualified     # 🔲 E0.6 black square button
 
-# Symbols subtotal:		301
-# Symbols subtotal:		301	w/o modifiers
+# Symbols subtotal:		302
+# Symbols subtotal:		302	w/o modifiers
 
 # group: Flags
 
@@ -4871,7 +4983,7 @@
 # Flags subtotal:		275	w/o modifiers
 
 # Status Counts
-# fully-qualified : 3512
+# fully-qualified : 3624
 # minimally-qualified : 817
 # unqualified : 252
 # component : 9